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

B2015-066: Last update for page number transitions was not correct. This fixes problem. (Note that last checkin listed incorrect bug number)

Browse Source
This commit is contained in:
Kathy Ruffing 2015-05-26 16:16:04 +00:00
parent 06944c6503
commit ba036e23ff
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -778,16 +778,23 @@ namespace VEPROMS.CSLA.Library
return "Invalid Transition Destination"; return "Invalid Transition Destination";
TransitionBuilder tb = SetupTransitionBuilder(formatInfo, fromInfo, tranType, toItem, TransitionBuilder tb = SetupTransitionBuilder(formatInfo, fromInfo, tranType, toItem,
toItem.ItemID==rangeItem.ItemID && !toItem.IsHigh?toItem.LastSibling:rangeItem); toItem.ItemID==rangeItem.ItemID && !toItem.IsHigh?toItem.LastSibling:rangeItem);
if (pagenum && (tranType==1||tranType==2||tranType==4) && !tb._TransFormat.Contains("{Page Num}"))
if (pagenum)
{
// The tranType parameter is really the index. For page number transitions, get the transition
// 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 (tranType == 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}";
} }
}
if(_AppendMethods==null) if(_AppendMethods==null)
SetupMethods(); SetupMethods();
if (toItem.MyDocVersion == null) if (toItem.MyDocVersion == null)