Compare commits

..

No commits in common. "8b18005b8e9715cd37501a35614f1d827f9c65f0" and "63a60b32cc495980ed2ae7f41a81f3f98f6487d2" have entirely different histories.

View File

@ -1165,10 +1165,7 @@ namespace VEPROMS.CSLA.Library
{ {
int sp = odte.Link.IndexOf(" ") + 1; // get past tran type int sp = odte.Link.IndexOf(" ") + 1; // get past tran type
string srecid = odte.Link.Substring(sp, odte.Link.IndexOf(" ", sp) - sp); string srecid = odte.Link.Substring(sp, odte.Link.IndexOf(" ", sp) - sp);
recid = System.Convert.ToInt32(srecid);
//CSM B2024-078 - when a bad transition link / does not contain a number, simply return the text as-is
if (int.TryParse(srecid, out recid))
{
foreach (ContentTransition ct in itm.MyContent.ContentTransitions) foreach (ContentTransition ct in itm.MyContent.ContentTransitions)
{ {
if (ct.TransitionID == recid) if (ct.TransitionID == recid)
@ -1178,7 +1175,6 @@ namespace VEPROMS.CSLA.Library
} }
} }
} }
}
else else
{ {
int sp = odte.Link.IndexOf(" "); int sp = odte.Link.IndexOf(" ");
@ -1660,15 +1656,7 @@ namespace VEPROMS.CSLA.Library
private string FixTransition(string link, string text) private string FixTransition(string link, string text)
{ {
if (link.IndexOf("<NewID>") != -1) return text; if (link.IndexOf("<NewID>") != -1) return text;
int transitionID = Convert.ToInt32(link.Split(" ".ToCharArray())[1]);
//CSM B2024-078 - when a bad transition link / does not contain a number, simply return the text as-is
int transitionID;
string[] splt_link = link.Split(' ');
if (splt_link.Length < 2 || !int.TryParse(splt_link[1], out transitionID))
{
return text;
}
// Find the transition // Find the transition
if (_MyItemInfo.MyContent.ContentTransitionCount <= 0) if (_MyItemInfo.MyContent.ContentTransitionCount <= 0)
{ {