From 791549a700bb88fcf26a581ec533dedcae839725 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 24 Jun 2015 14:28:01 +0000 Subject: [PATCH] =?UTF-8?q?Bug=20Fix=202015-084=20for=20Ginn=E2=80=99a=20A?= =?UTF-8?q?ttachment=20format.=20Fixed=20logic=20that=20determines=20if=20?= =?UTF-8?q?a=20group=20of=20Cautions=20/=20Notes=20get=20a=20bullet.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs index 0cba51ec..32c31345 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs @@ -3962,8 +3962,10 @@ namespace VEPROMS.CSLA.Library // treat cautions and notes as different if they are all NOT exactly the same type if (ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.OnlyBulletSameCautionNoteType) { - if (MyPrevious != null && MyPrevious.MyContent.Type != MyContent.Type) return true; - if (NextItem != null && NextItem.MyContent.Type != MyContent.Type) return true; + if (MyPrevious != null && MyPrevious.MyContent.Type != MyContent.Type && + ((MyPrevious.IsCaution && this.IsCaution) || (MyPrevious.IsNote && this.IsNote))) return true; + if (NextItem != null && NextItem.MyContent.Type != MyContent.Type && + ((NextItem.IsCaution && this.IsCaution) || (NextItem.IsNote && this.IsNote))) return true; } if (!FormatStepData.MixCautionsAndNotes) return false;