From f0493e60d847ede809b097bbf805e3122559e51c Mon Sep 17 00:00:00 2001 From: mschill Date: Fri, 25 Oct 2024 14:33:20 -0400 Subject: [PATCH] CSM B2024-087 Fix RO Editor Inconsistencies Refresh issue in RO Definitions. Modify an In Use field item that is not one of the Standard items, choose Continue, choose OK in the Text Definition Field. when prompted if want to Update Local or Generic definitions: 1. Prompt should contain table name (previously was not for Setpoint items) 2. If Select "Yes", Should refresh to new field name when return to previous screen / click ok to go back to RO Definition. --- PROMS/ReferencedObjects/Exe/RefObj/ROEditor/FieldCombFrm.cs | 2 ++ PROMS/ReferencedObjects/Exe/RefObj/ROEditor/FieldTextFrm.cs | 2 ++ PROMS/ReferencedObjects/Exe/RefObj/ROEditor/FieldTypeDefFrm.cs | 1 + PROMS/ReferencedObjects/Exe/RefObj/ROEditor/GroupDefFrm.cs | 1 + .../ReferencedObjects/LibSource/RODBInterface/RODBInterface.cs | 2 +- 5 files changed, 7 insertions(+), 1 deletion(-) diff --git a/PROMS/ReferencedObjects/Exe/RefObj/ROEditor/FieldCombFrm.cs b/PROMS/ReferencedObjects/Exe/RefObj/ROEditor/FieldCombFrm.cs index 64fcc1e7..d3dcb25c 100644 --- a/PROMS/ReferencedObjects/Exe/RefObj/ROEditor/FieldCombFrm.cs +++ b/PROMS/ReferencedObjects/Exe/RefObj/ROEditor/FieldCombFrm.cs @@ -377,6 +377,7 @@ namespace ROEditor this.btnOK.TabIndex = 3; this.btnOK.Text = "OK"; this.btnOK.Click += new System.EventHandler(this.btnOK_Click); + this.btnOK.DialogResult = System.Windows.Forms.DialogResult.OK; // // btnCancel // @@ -553,6 +554,7 @@ namespace ROEditor // update the local/internal copy of the schema. if (success != true) { + this.DialogResult = DialogResult.Cancel; return; // DO YET process an error. } else diff --git a/PROMS/ReferencedObjects/Exe/RefObj/ROEditor/FieldTextFrm.cs b/PROMS/ReferencedObjects/Exe/RefObj/ROEditor/FieldTextFrm.cs index a3f29b8a..30e33bd9 100644 --- a/PROMS/ReferencedObjects/Exe/RefObj/ROEditor/FieldTextFrm.cs +++ b/PROMS/ReferencedObjects/Exe/RefObj/ROEditor/FieldTextFrm.cs @@ -266,6 +266,7 @@ namespace ROEditor if (success != true) { + this.DialogResult = DialogResult.Cancel; return; // DO YET process an error. } else @@ -367,6 +368,7 @@ namespace ROEditor // // btnOK // + this.btnOK.DialogResult = System.Windows.Forms.DialogResult.OK; this.btnOK.Location = new System.Drawing.Point(216, 72); this.btnOK.Name = "btnOK"; this.btnOK.Size = new System.Drawing.Size(88, 24); diff --git a/PROMS/ReferencedObjects/Exe/RefObj/ROEditor/FieldTypeDefFrm.cs b/PROMS/ReferencedObjects/Exe/RefObj/ROEditor/FieldTypeDefFrm.cs index b603f083..b79ac3ba 100644 --- a/PROMS/ReferencedObjects/Exe/RefObj/ROEditor/FieldTypeDefFrm.cs +++ b/PROMS/ReferencedObjects/Exe/RefObj/ROEditor/FieldTypeDefFrm.cs @@ -248,6 +248,7 @@ namespace ROEditor if (success != true) { + this.DialogResult = DialogResult.Cancel; return; // DO YET process an error. } return; diff --git a/PROMS/ReferencedObjects/Exe/RefObj/ROEditor/GroupDefFrm.cs b/PROMS/ReferencedObjects/Exe/RefObj/ROEditor/GroupDefFrm.cs index ff0828fb..7eb532b6 100644 --- a/PROMS/ReferencedObjects/Exe/RefObj/ROEditor/GroupDefFrm.cs +++ b/PROMS/ReferencedObjects/Exe/RefObj/ROEditor/GroupDefFrm.cs @@ -433,6 +433,7 @@ namespace ROEditor // // btnOK // + this.btnOK.DialogResult = System.Windows.Forms.DialogResult.OK; this.btnOK.Location = new System.Drawing.Point(24, 248); this.btnOK.Name = "btnOK"; this.btnOK.Size = new System.Drawing.Size(144, 24); diff --git a/PROMS/ReferencedObjects/LibSource/RODBInterface/RODBInterface.cs b/PROMS/ReferencedObjects/LibSource/RODBInterface/RODBInterface.cs index a720cd45..d80335e4 100644 --- a/PROMS/ReferencedObjects/LibSource/RODBInterface/RODBInterface.cs +++ b/PROMS/ReferencedObjects/LibSource/RODBInterface/RODBInterface.cs @@ -2796,7 +2796,7 @@ namespace RODBInterface nodetocheck = (VlnXmlElement) nodetocheck.ParentNode; } - return nodetocheck.GetAttribute("MenuTitle"); + return nodetocheck.FirstChild.InnerText; } public override XmlSchema RODB_GetGroupSchema(VlnXmlElement elem)