From 13ade8e0b74156db7ac54543f37426aa41bc5aec Mon Sep 17 00:00:00 2001
From: John <jjenko@volian.com>
Date: Mon, 30 Jan 2017 19:44:25 +0000
Subject: [PATCH] =?UTF-8?q?B2017-019=20Don=E2=80=99t=20cook=20applicabilit?=
 =?UTF-8?q?y=20ROs=20(ex=20<u>)=20when=20displaying=20for=20editing=20B201?=
 =?UTF-8?q?7-019=20handle=20<u>=20in=20DisplayNumber?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 PROMS/VEPROMS.CSLA.Library/Extension/DisplayText.cs | 2 +-
 PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs     | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/DisplayText.cs b/PROMS/VEPROMS.CSLA.Library/Extension/DisplayText.cs
index 52196c15..c2d79a51 100644
--- a/PROMS/VEPROMS.CSLA.Library/Extension/DisplayText.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Extension/DisplayText.cs
@@ -291,7 +291,7 @@ namespace VEPROMS.CSLA.Library
 				text = DoReplaceWords2(text);
 				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(-|\\u8209\?)ID)\>", _MyItemInfo.MyDocVersion.DocVersionConfig.Unit_ID, RegexOptions.IgnoreCase);
diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs
index 6acc15e4..4b07c81a 100644
--- a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs
@@ -2567,8 +2567,7 @@ namespace VEPROMS.CSLA.Library
 				//if (str.Contains(@"<S\u8209?ID>"))
 				//  str = str.Replace(@"<S\u8209?ID>", MyDocVersion.DocVersionConfig.Unit_ID);
 				str = ConvertToDisplayText(str);
-				if (str.Contains("<u>"))
-					Console.WriteLine("it is still there");
+				str = Regex.Replace(str, @"\<[uU]\>", MyDocVersion.DocVersionConfig.Unit_Number); // B2017-019 - process "<u>" in section number
 				return str;
 			}
 			//get { return ConvertToDisplayText(MyContent.Number); }