From de0e7d3613e97c019c37d3f9d305de1c1b9ffddb Mon Sep 17 00:00:00 2001 From: John Date: Fri, 31 Mar 2017 15:18:02 +0000 Subject: [PATCH] =?UTF-8?q?B2017-069=20=E2=80=93=20remove=20enhanced=20doc?= =?UTF-8?q?ument=20information=20from=20the=20config=20when=20a=20step=20i?= =?UTF-8?q?s=20restored=20from=20history=20Added=20a=20null=20check?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../VEPROMS.CSLA.Library/Extension/AuditExt.cs | 17 +++++++++++++++++ PROMS/Volian.Controls.Library/RTBItem.cs | 3 ++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/AuditExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/AuditExt.cs index 40ef6607..e658fefe 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/AuditExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/AuditExt.cs @@ -7,6 +7,7 @@ using Csla.Validation; using System.Data.SqlClient; using System.Data; using System.Text.RegularExpressions; +using System.Xml; namespace VEPROMS.CSLA.Library { @@ -1629,6 +1630,22 @@ namespace VEPROMS.CSLA.Library ContentInfo.Refresh(cctmp); } } + // B2017-069 when we restore a step the once had enhanced document links, + // remove the enhanced document link information - fixes delete/restore issue of linked steps. + XmlDocument xd = new XmlDocument(); + xd.LoadXml(tmp.MyContent.Config); + XmlNode xn = xd.DocumentElement.SelectSingleNode("Enhanced"); + if (xn != null) + { + xn.ParentNode.RemoveChild(xn); + string config = xd.OuterXml; + using (Content ctmp = tmp.MyContent.Get()) + { + ctmp.Config = config; + ctmp.Save(); + ContentInfo.Refresh(ctmp); + } + } return tmp; } catch (Exception ex) diff --git a/PROMS/Volian.Controls.Library/RTBItem.cs b/PROMS/Volian.Controls.Library/RTBItem.cs index 2e60121f..b9676e60 100644 --- a/PROMS/Volian.Controls.Library/RTBItem.cs +++ b/PROMS/Volian.Controls.Library/RTBItem.cs @@ -462,7 +462,8 @@ namespace Volian.Controls.Library { ItemInfo ii = ItemInfo.Get(ed.ItemID); //if (MyStepPanel.MyStepTabPanel.MyDisplayTabControl.IsItemInfoProcedureOpen(ii)) - MyStepPanel.MyStepTabPanel.MyDisplayTabControl.OnRefreshEnhancedDocument(new ItemSelectedChangedEventArgs(ii)); + if (ii != null) + MyStepPanel.MyStepTabPanel.MyDisplayTabControl.OnRefreshEnhancedDocument(new ItemSelectedChangedEventArgs(ii)); if (dti != null) dti.MyStepTabPanel.MyDisplayTabControl.OpenItem(this.MyItemInfo); }