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

B2017-019 Don’t cook applicability ROs (ex <u>) when displaying for editing

Browse Source 
B2017-019 handle <u> in DisplayNumber
This commit is contained in:
John Jenko
2017-01-30 19:44:25 +00:00
parent 8defa23e65
commit 13ade8e0b7
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
PROMS/VEPROMS.CSLA.Library/Extension/DisplayText.cs
View File

@@ -291,7 +291,7 @@ namespace VEPROMS.CSLA.Library
text = DoReplaceWords2(text); text = DoReplaceWords2(text);
ProfileTimer.Pop(profileDepth1); ProfileTimer.Pop(profileDepth1);
} }
if (_MyItemInfo != null) if (_MyItemInfo != null && ROsShouldBeAdjusted) // B2017-019 - added check for ROsShouldBeAdjusted so that these token are not "cooked" on property pages
{ {
text = Regex.Replace(text, @"\<U\>", _MyItemInfo.MyDocVersion.DocVersionConfig.Unit_Number, RegexOptions.IgnoreCase); text = Regex.Replace(text, @"\<U\>", _MyItemInfo.MyDocVersion.DocVersionConfig.Unit_Number, RegexOptions.IgnoreCase);
text = Regex.Replace(text, @"\<(U(-|\\u8209\?)ID)\>", _MyItemInfo.MyDocVersion.DocVersionConfig.Unit_ID, RegexOptions.IgnoreCase); text = Regex.Replace(text, @"\<(U(-|\\u8209\?)ID)\>", _MyItemInfo.MyDocVersion.DocVersionConfig.Unit_ID, RegexOptions.IgnoreCase);

3
PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs
View File

@@ -2567,8 +2567,7 @@ namespace VEPROMS.CSLA.Library
//if (str.Contains(@"<S\u8209?ID>")) //if (str.Contains(@"<S\u8209?ID>"))
// str = str.Replace(@"<S\u8209?ID>", MyDocVersion.DocVersionConfig.Unit_ID); // str = str.Replace(@"<S\u8209?ID>", MyDocVersion.DocVersionConfig.Unit_ID);
str = ConvertToDisplayText(str); str = ConvertToDisplayText(str);
if (str.Contains("<u>")) str = Regex.Replace(str, @"\<[uU]\>", MyDocVersion.DocVersionConfig.Unit_Number); // B2017-019 - process "<u>" in section number
Console.WriteLine("it is still there");
return str; return str;
} }
//get { return ConvertToDisplayText(MyContent.Number); } //get { return ConvertToDisplayText(MyContent.Number); }