From 62a24592f915f519ff32120de4a13c4dd99ab037 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 22 Jan 2014 15:11:53 +0000 Subject: [PATCH] Fixed issue where Cautions and Notes where being inserted at the high level step level when using the template logic. --- PROMS/VEPROMS.CSLA.Library/Extension/ItemInsertExt.cs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/ItemInsertExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/ItemInsertExt.cs index 31becb21..8a9af52b 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/ItemInsertExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/ItemInsertExt.cs @@ -298,7 +298,7 @@ namespace VEPROMS.CSLA.Library ((ItemInfo)ActiveParent).MyContent.RefreshContentParts(); return tmp; } - private ItemInfo InsertSmartTemplateSubStep(string text, string number, ItemInfo tmp, EAddpingPart adPart, int type) + private ItemInfo InsertSmartTemplateSubStep(string text, string number, ItemInfo tmp, EAddpingPart adPart, int type, E_FromType fromTypeTop) { int newItemID = 0; int topType = GetSmartTemplateTopLevelIndxOfThisType(type); @@ -315,7 +315,8 @@ namespace VEPROMS.CSLA.Library { if (firstSmart == null) { - firstSmart = NewItemInfoFetch(ItemID, adPart, number, tmptext, type, null, null, null, DateTime.Now, Volian.Base.Library.VlnSettings.UserID); + firstSmart = NewItemInfoFetch(ItemID, adPart, number, tmptext, type, (int ?)fromTypeTop, null, null, DateTime.Now, Volian.Base.Library.VlnSettings.UserID); + //firstSmart = NewItemInfoFetch(ItemID, adPart, number, tmptext, type, null, null, null, DateTime.Now, Volian.Base.Library.VlnSettings.UserID); siblingSmart = firstSmart; newItemID = firstSmart.ItemID; } @@ -630,7 +631,8 @@ namespace VEPROMS.CSLA.Library public ItemInfo InsertChild(E_FromType fromType, int type, string text, string number) { ItemInfo tmp = null; - tmp = InsertSmartTemplateSubStep(text, number, tmp, EAddpingPart.After, type); + tmp = InsertSmartTemplateSubStep(text, number, tmp, EAddpingPart.Child, type, fromType); + //tmp = InsertSmartTemplateSubStep(text, number, tmp, EAddpingPart.After, type); if (tmp == null) tmp = NewItemInfoFetch(ItemID, EAddpingPart.Child, number, text, type, (int?)fromType, null, null, DateTime.Now, Volian.Base.Library.VlnSettings.UserID); // if next exists, it is updated in SQL so we have to manually force the iteminfo updates