Compare commits
No commits in common. "a94fb328debfea7ae2c27336748ae3db8ffb5f7a" and "928fba3b3750b57c3c4d91818dadfd653a1fe53e" have entirely different histories.
a94fb328de
...
928fba3b37
@ -4116,11 +4116,6 @@ namespace VEPROMS
|
|||||||
|
|
||||||
ROFSTLookup lookup = MyDocVersion.DocVersionAssociations[0].MyROFst.GetROFSTLookup(MyDocVersion);
|
ROFSTLookup lookup = MyDocVersion.DocVersionAssociations[0].MyROFst.GetROFSTLookup(MyDocVersion);
|
||||||
|
|
||||||
// B2023-104 use this to replace RO Link information in the imported text
|
|
||||||
// FormatRoidKey() was creating the roid with the new formatting introduce with B2022-088 & B2022-098
|
|
||||||
// We need to save the ROID from the imported text in order to update it with the new RO link information
|
|
||||||
string contentROID = roid;
|
|
||||||
|
|
||||||
// B2022-088: [JPR] Find Doc Ro button not working in Word Sections
|
// B2022-088: [JPR] Find Doc Ro button not working in Word Sections
|
||||||
// B2022-098: [JPR] ROs not being resolved in Word Sections
|
// B2022-098: [JPR] ROs not being resolved in Word Sections
|
||||||
roid = ROFSTLookup.FormatRoidKey(roid, true);
|
roid = ROFSTLookup.FormatRoidKey(roid, true);
|
||||||
@ -4140,8 +4135,7 @@ namespace VEPROMS
|
|||||||
rou.Save();
|
rou.Save();
|
||||||
|
|
||||||
RoUsageInfo roui = RoUsageInfo.Get(rou.ROUsageID);
|
RoUsageInfo roui = RoUsageInfo.Get(rou.ROUsageID);
|
||||||
//B2023-104 use the ROID from the imported text (contentROID) to create the lookFor string
|
string lookFor = string.Format("#Link:ReferencedObject:{0} {1} {2}[END>", rousageid, roid, oldRODbID.ToString());
|
||||||
string lookFor = string.Format("#Link:ReferencedObject:{0} {1} {2}[END>", rousageid, contentROID, oldRODbID.ToString());
|
|
||||||
string replaceWith = string.Format("#Link:ReferencedObject:{0} {1} {2}[END>", rou.ROUsageID.ToString(), roid, newRODbID.ToString());
|
string replaceWith = string.Format("#Link:ReferencedObject:{0} {1} {2}[END>", rou.ROUsageID.ToString(), roid, newRODbID.ToString());
|
||||||
_DidProcessROs = content.Text.Contains(lookFor); // B2017-076 RO link in the text so we will be processing it
|
_DidProcessROs = content.Text.Contains(lookFor); // B2017-076 RO link in the text so we will be processing it
|
||||||
|
|
||||||
|
@ -3112,18 +3112,9 @@ namespace Volian.Controls.Library
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
LinkText lt = new LinkText(_MyStepRTB.MyLinkText);
|
LinkText lt = new LinkText(_MyStepRTB.MyLinkText);
|
||||||
//B2023-104 If we could not get the MyRoUsageInfo then we have a bad RO Link. Tell user to re-link the RO
|
|
||||||
if (lt.MyRoUsageInfo != null)
|
|
||||||
{
|
|
||||||
myROID = lt.MyRoUsageInfo.ROID.ToLower();
|
myROID = lt.MyRoUsageInfo.ROID.ToLower();
|
||||||
myRODB = lt.MyRoUsageInfo.MyRODb;
|
myRODB = lt.MyRoUsageInfo.MyRODb;
|
||||||
}
|
}
|
||||||
else
|
|
||||||
{
|
|
||||||
FlexibleMessageBox.Show("Invalid RO link information.\n\n Please re-link this RO value.", "Invalid RO Reference", MessageBoxButtons.OK, MessageBoxIcon.Information);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (myROID == null) return;
|
if (myROID == null) return;
|
||||||
if (myROID.StartsWith("ffff"))
|
if (myROID.StartsWith("ffff"))
|
||||||
{
|
{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user