diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs index da9abd64..ebbff576 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs @@ -1960,11 +1960,9 @@ namespace VEPROMS.CSLA.Library { get { - if (FormatStepData != null) - { - E_AccStep? actable = FormatStepData.StepEditData.AcTable; - return (actable != null && MyActiveSection != null && MyActiveSection.IsEnhancedSection && ((actable & E_AccStep.EnhancedLinkedStep) != 0)); - } + if (!IsStep) return false; + StepConfig sc = MyConfig as StepConfig; + if (sc.MyEnhancedDocuments != null && sc.MyEnhancedDocuments.Count == 1 && sc.MyEnhancedDocuments[0].Type == 0) return true; return false; } } diff --git a/PROMS/VEPROMS.CSLA.Library/Format/ENums.cs b/PROMS/VEPROMS.CSLA.Library/Format/ENums.cs index 7f3fbbbd..8bbae5c5 100644 --- a/PROMS/VEPROMS.CSLA.Library/Format/ENums.cs +++ b/PROMS/VEPROMS.CSLA.Library/Format/ENums.cs @@ -188,7 +188,6 @@ namespace VEPROMS.CSLA.Library AddingTable = 16, AddingNext = 32, AddingPrev = 64, - EnhancedLinkedStep = 128 // this will flag that this is a linked step & should not allow inserts/deletes } [Flags] public enum E_ReplaceFlags : uint diff --git a/PROMS/Volian.Controls.Library/StepTabRibbon.cs b/PROMS/Volian.Controls.Library/StepTabRibbon.cs index 848bba1a..312c4b6d 100644 --- a/PROMS/Volian.Controls.Library/StepTabRibbon.cs +++ b/PROMS/Volian.Controls.Library/StepTabRibbon.cs @@ -1508,10 +1508,9 @@ namespace Volian.Controls.Library StepData sd = MyItemInfo.FormatStepData; actable = sd.StepEditData.AcTable; if (actable == null) actable = 0; - //btnInsHLS.Enabled = !MyItemInfo.IsEnhancedStep && MyItemInfo.MyHLS != null && !MyItemInfo.MyHLS.IsEnhancedStep; // (actable & E_AccStep.EnhancedLinkedStep) == 0; - btnInsHLS.Enabled = MyItemInfo.MyHLS != null; // (actable & E_AccStep.EnhancedLinkedStep) == 0; + btnInsHLS.Enabled = MyItemInfo.MyHLS != null; - btnInsCaut.Enabled = ((actable & E_AccStep.AddingCaution) > 0) && !MyItemInfo.IsEnhancedStep; // ((actable & E_AccStep.AddingCaution) > 0) && ((actable & E_AccStep.EnhancedLinkedStep) == 0); + btnInsCaut.Enabled = ((actable & E_AccStep.AddingCaution) > 0) && !MyItemInfo.IsEnhancedStep; btnInsNote.Enabled = ((actable & E_AccStep.AddingNote) > 0) && !MyItemInfo.IsEnhancedStep; btnInsRNO.Enabled = (actable & E_AccStep.AddingRNO) > 0; btnInsFig.Enabled = (actable & E_AccStep.AddingTable) > 0;