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

B2018-104: Top continue message printed when step was just starting and sub-sub-steps break at less ideal location.

Browse Source
This commit is contained in:
Kathy Ruffing
2018-07-16 16:06:36 +00:00
parent 5438908754
commit 4cc99a1d6c
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs
View File

@@ -1378,7 +1378,8 @@ namespace VEPROMS.CSLA.Library
{
ItemInfo parent = ActiveParent as ItemInfo;
if (parent == null) return false;
if (parent.IsExactType("And") || parent.IsExactType("Or")) return true;
// B2018-104: Make the following check consistent with what is in CalcStepLevel (added ImplicitOr)
if (parent.IsExactType("And") || parent.IsExactType("Or") || parent.IsExactType("ImplicitOr")) return true;
return parent.ParentAndOr;
}
}
@@ -1388,7 +1389,8 @@ namespace VEPROMS.CSLA.Library
{
ItemInfo parent = ActiveParent as ItemInfo;
if (parent == null) return 0;
if (parent.IsExactType("And") || parent.IsExactType("Or")) return 1 + parent.ParentAndOrCount;
// B2018-104: Make the following check consistent with what is in CalcStepLevel (added ImplicitOr)
if (parent.IsExactType("And") || parent.IsExactType("Or") || parent.IsExactType("ImplicitOr")) return 1 + parent.ParentAndOrCount;
return parent.ParentAndOrCount;
}
}