From a550ef1b50f5485c96deee28d42cbc54c24355e7 Mon Sep 17 00:00:00 2001 From: mschill Date: Thu, 10 Oct 2024 08:38:35 -0400 Subject: [PATCH] B2024-078 Bad Transition preventing editing of a substep. Can enter changed text, but then when move to another textbox, original text returns. --- .../Extension/DisplayText.cs | 24 ++++++++++++++----- 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/DisplayText.cs b/PROMS/VEPROMS.CSLA.Library/Extension/DisplayText.cs index e43bafcf..67c0602f 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/DisplayText.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/DisplayText.cs @@ -1165,13 +1165,17 @@ namespace VEPROMS.CSLA.Library { int sp = odte.Link.IndexOf(" ") + 1; // get past tran type string srecid = odte.Link.Substring(sp, odte.Link.IndexOf(" ", sp) - sp); - recid = System.Convert.ToInt32(srecid); - foreach (ContentTransition ct in itm.MyContent.ContentTransitions) + + //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)) { - if (ct.TransitionID == recid) + foreach (ContentTransition ct in itm.MyContent.ContentTransitions) { - itm.MyContent.ContentTransitions.Remove(ct); - break; + if (ct.TransitionID == recid) + { + itm.MyContent.ContentTransitions.Remove(ct); + break; + } } } } @@ -1656,7 +1660,15 @@ namespace VEPROMS.CSLA.Library private string FixTransition(string link, string text) { if (link.IndexOf("") != -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 if (_MyItemInfo.MyContent.ContentTransitionCount <= 0) {