From ee919736822423e7b6e5a08baaff176c82813160 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 21 Mar 2016 15:13:44 +0000 Subject: [PATCH] B2016-081 if a transition is to a non-editable section, also check that if it goes to a step in that non-editable section --- PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs | 2 +- PROMS/VEPROMS.CSLA.Library/Extension/ItemInsertExt.cs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs index f181bcf7..612f1926 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs @@ -634,7 +634,7 @@ namespace VEPROMS.CSLA.Library if (traninfo.MyItemToID.ActiveSection != null) { SectionConfig sc = traninfo.MyItemToID.ActiveSection.MyConfig as SectionConfig; - forceConvertToText = (sc.SubSection_Edit == "N"); + forceConvertToText = (sc.SubSection_Edit == "N" && traninfo.MyItemToID.IsStep); // Bug fix B2016-081 also check if transition is to a step element } if (forceConvertToText) { diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/ItemInsertExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/ItemInsertExt.cs index 71481076..4964d07a 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/ItemInsertExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/ItemInsertExt.cs @@ -744,7 +744,7 @@ namespace VEPROMS.CSLA.Library { SectionConfig sc = tran.MyItemToID.ActiveSection.MyConfig as SectionConfig; //SectionConfig sc = new SectionConfig(tran.MyItemToID.ActiveSection.MyConfig.ToString()); - forceConvertToText = (sc.SubSection_Edit == "N"); + forceConvertToText = (sc.SubSection_Edit == "N" && tran.MyItemToID.IsStep); // Bug fix B2016-081 also check if transition is to a step element } if (!forceConvertToText) //check to see if external with internal format { @@ -793,7 +793,7 @@ namespace VEPROMS.CSLA.Library { SectionConfig sc = tran.MyItemToID.ActiveSection.MyConfig as SectionConfig; //SectionConfig sc = new SectionConfig(tran.MyItemToID.ActiveSection.MyConfig.ToString()); - forceConvertToText = (sc.SubSection_Edit == "N"); + forceConvertToText = (sc.SubSection_Edit == "N" && tran.MyItemToID.IsStep); // Bug fix B2016-081 also check if transition is to a step element } if (!forceConvertToText) //check to see if external with internal format {