Volian/SourceCode
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed logic to find external transition when attempting to delete a procedure

Browse Source
This commit is contained in:
Rich
2015-05-29 00:18:09 +00:00
parent 1463ec8853
commit 4f16b9ca67
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs
View File

@@ -312,6 +312,7 @@ namespace VEPROMS.CSLA.Library
TransitionInfoList tmp = DataPortal.Fetch<TransitionInfoList>(new ExternalTransitionsToChildrenCriteria(itemID)); TransitionInfoList tmp = DataPortal.Fetch<TransitionInfoList>(new ExternalTransitionsToChildrenCriteria(itemID));
TransitionInfo.AddList(tmp); TransitionInfo.AddList(tmp);
tmp.AddEvents(); tmp.AddEvents();
if (tmp.Count == 0) return GetExternalTransitions(itemID);
return tmp; return tmp;
} }
catch (Exception ex) 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. // 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; 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 ((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")) if (strantype == 2 && tb._TransFormat.Contains("{First Step"))
{ {
tb._TransFormat = tb._TransFormat.Insert(tb._TransFormat.IndexOf("{First Step}") + 12, " {Page Num}"); tb._TransFormat = tb._TransFormat.Insert(tb._TransFormat.IndexOf("{First Step}")+12, " {Page Num}");
}
else
tb._TransFormat = tb._TransFormat + " {Page Num}";
} }
else
tb._TransFormat = tb._TransFormat + " {Page Num}";
}
} }
if(_AppendMethods==null) if(_AppendMethods==null)
SetupMethods(); SetupMethods();