From 4f16b9ca670a5a9b550700d3682283d82f695dee Mon Sep 17 00:00:00 2001 From: Rich Date: Fri, 29 May 2015 00:18:09 +0000 Subject: [PATCH] Fixed logic to find external transition when attempting to delete a procedure --- .../Extension/TransitionExt.cs | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs index 151c606a..62cab0f9 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs @@ -312,6 +312,7 @@ namespace VEPROMS.CSLA.Library TransitionInfoList tmp = DataPortal.Fetch(new ExternalTransitionsToChildrenCriteria(itemID)); TransitionInfo.AddList(tmp); tmp.AddEvents(); + if (tmp.Count == 0) return GetExternalTransitions(itemID); return tmp; } catch (Exception ex) @@ -785,15 +786,15 @@ namespace VEPROMS.CSLA.Library // type (holdover from 16bit, used to define whether transitions are range) for range transitions, the page number goes after the 1st step. int strantype = tranType < tb._FromItem.ActiveFormat.PlantFormat.FormatData.TransData.TransTypeList.Count ? (int)tb._FromItem.ActiveFormat.PlantFormat.FormatData.TransData.TransTypeList[tranType].Type : 0; if ((strantype == 1 || strantype == 2 || strantype == 4) && !tb._TransFormat.Contains("{Page Num}")) - { - // if range transition, the page number token needs to go after the first step, else it's at the end: + { + // if range transition, the page number token needs to go after the first step, else it's at the end: if (strantype == 2 && tb._TransFormat.Contains("{First Step")) - { - tb._TransFormat = tb._TransFormat.Insert(tb._TransFormat.IndexOf("{First Step}") + 12, " {Page Num}"); - } - else - tb._TransFormat = tb._TransFormat + " {Page Num}"; + { + tb._TransFormat = tb._TransFormat.Insert(tb._TransFormat.IndexOf("{First Step}")+12, " {Page Num}"); } + else + tb._TransFormat = tb._TransFormat + " {Page Num}"; + } } if(_AppendMethods==null) SetupMethods();