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

Fixed bug B2017-003 which required you to exit proms after doing an import so that doing a goto on a transition (in a table) would work properly

Browse Source
This commit is contained in:
John Jenko 2017-01-16 20:14:37 +00:00
parent 4744bcd450
commit 3c471efd9f
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
PROMS/VEPROMS User Interface/dlgExportImport.cs
View File

@ -2624,6 +2624,10 @@ namespace VEPROMS
if (content.MyGrid != null && content.MyGrid.Data != "") if (content.MyGrid != null && content.MyGrid.Data != "")
content.MyGrid.Data = content.MyGrid.Data.Replace(lookfor, replacewith); content.MyGrid.Data = content.MyGrid.Data.Replace(lookfor, replacewith);
content.FixTransitionText(TransitionInfo.Get(tt.TransitionID)); content.FixTransitionText(TransitionInfo.Get(tt.TransitionID));
// B2017=003 make sure any grid changes are saved.
// done here because FixTransitionText() could update the transitions in the grid
if (content.MyGrid != null && content.MyGrid.Data != "")
content.MyGrid.Save();
content.Save(); content.Save();
} }
else else
@ -2699,6 +2703,10 @@ namespace VEPROMS
forceConvertToText = (sc.SubSection_Edit == "N"); forceConvertToText = (sc.SubSection_Edit == "N");
} }
cc.FixTransitionText(TransitionInfo.Get(tt.TransitionID), forceConvertToText); cc.FixTransitionText(TransitionInfo.Get(tt.TransitionID), forceConvertToText);
// B2017=003 make sure any grid changes are saved.
// done here because FixTransitionText() could update the transitions in the grid
if (cc.MyGrid != null && cc.MyGrid.Data != "")
cc.MyGrid.Save();
cc.Save(); cc.Save();
nd.InnerText = "done"; nd.InnerText = "done";
} }
@ -2757,6 +2765,10 @@ namespace VEPROMS
// forceConvertToText = true; // forceConvertToText = true;
//} //}
cc.FixTransitionText(TransitionInfo.Get(tt.TransitionID), forceConvertToText); cc.FixTransitionText(TransitionInfo.Get(tt.TransitionID), forceConvertToText);
// B2017=003 make sure any grid changes are saved.
// done here because FixTransitionText() could update the transitions in the grid
if (cc.MyGrid != null && cc.MyGrid.Data != "")
cc.MyGrid.Save();
cc.Save(); cc.Save();
nd.InnerText = "done"; nd.InnerText = "done";
_DidConvertTransitionsToText |= forceConvertToText; // B2016-225 - notify user when transitions are converted to text _DidConvertTransitionsToText |= forceConvertToText; // B2016-225 - notify user when transitions are converted to text