Fixed logic to find external transition when attempting to delete a procedure
This commit is contained in:
parent
1463ec8853
commit
4f16b9ca67
@ -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)
|
||||||
@ -789,7 +790,7 @@ namespace VEPROMS.CSLA.Library
|
|||||||
// 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
|
else
|
||||||
tb._TransFormat = tb._TransFormat + " {Page Num}";
|
tb._TransFormat = tb._TransFormat + " {Page Num}";
|
||||||
|
Loading…
x
Reference in New Issue
Block a user