From 6b959e09cb62b58d74de1b3f71f6500e89502f98 Mon Sep 17 00:00:00 2001 From: Rich Date: Fri, 16 Nov 2012 20:14:51 +0000 Subject: [PATCH] Fixed logic to eliminate errors when annotation is added --- PROMS/DataLoader/TransitionFixer.cs | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/PROMS/DataLoader/TransitionFixer.cs b/PROMS/DataLoader/TransitionFixer.cs index 0c30f8b2..d1b7c622 100644 --- a/PROMS/DataLoader/TransitionFixer.cs +++ b/PROMS/DataLoader/TransitionFixer.cs @@ -120,11 +120,27 @@ namespace DataLoader updatedText = (updatedText.Replace("", "[END>"); string sstring = AdjustSizeAndGetSearchString(updatedText, itm); itm.MyContent.Text = sstring; + if (item.NewTransToUnNumberedItem) + { + ItemAnnotation ia = itm.ItemAnnotations.Add(VerificationRequiredType); + ia.SearchText = "Transition to un-numbered step"; + ia.UserID = "Migration"; + } itm.Save(); } } else { + if (item.NewTransToUnNumberedItem) + { + using (Item itm = item.Get()) + { + ItemAnnotation ia = itm.ItemAnnotations.Add(VerificationRequiredType); + ia.SearchText = "Transition to un-numbered step"; + ia.UserID = "Migration"; + itm.Save(); + } + } using (Content c = item.MyContent.Get()) { c.Text = updatedText; @@ -132,17 +148,7 @@ namespace DataLoader } } // Added for transitions to un-numbered steps - if (item.NewTransToUnNumberedItem) - { - using (Item itm = item.Get()) - { - ItemAnnotation ia = itm.ItemAnnotations.Add(VerificationRequiredType); - ia.SearchText = "Transition to un-numbered step"; - ia.UserID = "Migration"; - itm.Save(); - } - } - if (checkRTF) + if (checkRTF) { MyStepRTB.MyItemInfo = item; // Force Save - This will put change bars on everything