From 2a28bac3337e418d20eaa7cd548d1e3b8b3cf6d9 Mon Sep 17 00:00:00 2001 From: Kathy Date: Tue, 8 Aug 2017 15:16:04 +0000 Subject: [PATCH] B2017-170: fix null reference and remove fix for B2017-169 (fixed in underlying code in ItemInfoList) --- PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs index a78ad4b0..c593870f 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs @@ -614,10 +614,10 @@ namespace VEPROMS.CSLA.Library if (itemInfo.MyContent.ContentPartCount > 0) foreach (PartInfo pi in itemInfo.MyContent.ContentParts) { - List myItems = new List(); + //List myItems = new List(); foreach (ItemInfo ii in pi.MyItems) - myItems.Add(ii); - foreach (ItemInfo ii in myItems) + // myItems.Add(ii); + //foreach (ItemInfo ii in myItems) MyRefreshTransitions(ii, itemInfo, (itemInfo as SectionInfo) ?? sectionInfo, procInfo, docVersionInfo, tranLookup); } if (itemInfo.MyContent.ContentTransitionCount > 0) @@ -671,7 +671,7 @@ namespace VEPROMS.CSLA.Library } if (!forceConvertToText) { - if (itemInfo.MyDocVersion.VersionID != traninfo.MyItemToID.MyDocVersion.VersionID) //different doc version + if (itemInfo.MyDocVersion != null && traninfo.MyItemToID.MyDocVersion != null && itemInfo.MyDocVersion.VersionID != traninfo.MyItemToID.MyDocVersion.VersionID) //different doc version { if (!itemInfo.ActiveFormat.PlantFormat.FormatData.TransData.TransTypeList[traninfo.TranType].TransMenu.Contains("Proc")) //internal format if (!itemInfo.ActiveFormat.PlantFormat.FormatData.TransData.TransTypeList[traninfo.TranType].TransMenu.Contains("other proc")) //B2017-068 paste with transition fix @@ -781,10 +781,10 @@ namespace VEPROMS.CSLA.Library if (itemInfo.MyContent.ContentPartCount > 0) foreach (PartInfo pi in itemInfo.MyContent.ContentParts) { - List myItems = new List(); + //List myItems = new List(); foreach (ItemInfo ii in pi.MyItems) - myItems.Add(ii); - foreach (ItemInfo ii in myItems) + // myItems.Add(ii); + //foreach (ItemInfo ii in myItems) MyRefreshReferenceObjects(ii, itemInfo, (itemInfo as SectionInfo) ?? sectionInfo, docVersionInfo); } ROFstInfo rofstinfo = docVersionInfo.DocVersionAssociations[0].MyROFst; @@ -5691,6 +5691,7 @@ namespace VEPROMS.CSLA.Library try { ItemInfoList tmp = DataPortal.Fetch(new ItemListSearchCriteria(docVersionList, stepTypeList, searchString, caseSensitive, includeLinks, includeRtfFormatting, includeSpecialCharacters, unitPrefix)); + tmp.SourceOfList = "Search"; ItemInfo.AddList(tmp); tmp.AddEvents(); return tmp;