This commit is contained in:
2011-07-19 16:47:42 +00:00
parent 7b177a88f6
commit 71f7aaa018
2 changed files with 9 additions and 2 deletions

View File

@@ -494,7 +494,6 @@ namespace VEPROMS.CSLA.Library
parenstr);
lretstr.Append(tb._FormatData.TransData.DelimiterForTransitionTitle);
}
// LATER: if (DoSectionTransitions && GetSTepNO(TSeq1)) TransitionCat(AddCommaStep", Step"));
tb.ReplaceToken(lretstr.ToString());
return (lretstr.Length != 0);
}
@@ -715,6 +714,12 @@ namespace VEPROMS.CSLA.Library
private static bool AddTranGetSectionNumber(TransitionBuilder tb)
{
if (tb._TranType == 1 && tb._ToItem.ActiveSection.ItemID == tb._FromItem.ActiveSection.ItemID) return false;
if (tb._TranType == 0 && (tb._ToItem.IsSection || tb._ToItem.IsProcedure) && ((tb._TransUI & E_TransUI.StepAllowNone) == E_TransUI.StepAllowNone))
{
string tmpStr = tb.ToString();
if (tmpStr.ToUpper().EndsWith(", STEP ")) tb.Remove(tb.Length - 7, 7); // 7 is length of ", Step "
return true;
}
string retstr = TranGetSectionNumber(tb._ToItem);
tb.AppendPrefix();
tb.ReplaceToken(retstr);