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

B2020-017: If editing step after approval with a blank change id, a change bar w/ previous change id prints

Browse Source
This commit is contained in:
Kathy Ruffing
2020-02-17 13:23:40 +00:00
parent bde69ec7b2
commit 885153e305
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
PROMS/Volian.Controls.Library/RTBItem.cs
View File

@@ -778,6 +778,7 @@ namespace Volian.Controls.Library
if (!MyStepRTB.ActiveMode) return; if (!MyStepRTB.ActiveMode) return;
if (MyStepRTB.IsExperimenting) return; if (MyStepRTB.IsExperimenting) return;
if (MyStepRTB.MyItemInfo.MyContent.Number != null && !MyStepRTB.IsDirty && MyStepRTB.Text.Contains("(Resolved Transition Text)") == false) return; if (MyStepRTB.MyItemInfo.MyContent.Number != null && !MyStepRTB.IsDirty && MyStepRTB.Text.Contains("(Resolved Transition Text)") == false) return;
bool hasChangeBar = MyStepRTB.MyItemInfo.HasChangeBar;
bool success = MyStepRTB.OrigDisplayText.Save((RichTextBox)MyStepRTB); bool success = MyStepRTB.OrigDisplayText.Save((RichTextBox)MyStepRTB);
if (success) if (success)
{ {
@@ -794,6 +795,16 @@ namespace Volian.Controls.Library
sc.Step_ChangeID = this.MyStepPanel.MyStepTabPanel.MyDisplayTabControl.ChgId; sc.Step_ChangeID = this.MyStepPanel.MyStepTabPanel.MyDisplayTabControl.ChgId;
//if (MyStepRTB.MyItemInfo.MyConfig == null) itm.MyContent.Config = sc.ToString(); //if (MyStepRTB.MyItemInfo.MyConfig == null) itm.MyContent.Config = sc.ToString();
} }
// B2020-017: If making an editorial change, clear the Change id. Having the change id on
// was adding/printing a change bar.
if (MyStepRTB.MyItemInfo.IsStep &&
MyStepRTB.MyItemInfo.ActiveFormat.PlantFormat.FormatData.ProcData.ChangeBarData.ChangeIds
&& this.MyStepPanel.MyStepTabPanel.MyDisplayTabControl.EditorialChange
&& hasChangeBar == false)
{
if (sc == null) sc = new StepConfig();
sc.Step_ChangeID = null;
}
// B2015-024 Have Spell Checker text changes be an editorial change (not assign a change bar but keep existing change bar) // B2015-024 Have Spell Checker text changes be an editorial change (not assign a change bar but keep existing change bar)
if (MyItemInfo.ActiveFormat.PlantFormat.FormatData.EditData.EditoralSpellCheck) if (MyItemInfo.ActiveFormat.PlantFormat.FormatData.EditData.EditoralSpellCheck)
{ {