Fixing #773 Removing value and also valueof when needed.

rappen · Feb 6, 2023 · 308bcfd · 308bcfd
1 parent 98a3e47
commit 308bcfd
Showing 1 changed file with 17 additions and 1 deletion.
diff --git a/FetchXmlBuilder/Controls/conditionControl.cs b/FetchXmlBuilder/Controls/conditionControl.cs
@@ -277,10 +277,26 @@ protected override ControlValidationResult ValidateControl(Control control)
         protected override Dictionary<string, string> GetAttributesCollection()
         {
             var result = base.GetAttributesCollection();
-            if (!result.ContainsKey("value") && cmbValue.Enabled && cmbValue.DropDownStyle == ComboBoxStyle.Simple)
+            if (panValueOf.Visible == false && result.ContainsKey("valueof"))
+            {
+                result.Remove("valueof");
+            }
+            if (panValueOf.Visible == true && result.ContainsKey("valueof") && !string.IsNullOrWhiteSpace(result["valueof"]))
+            {
+                if (result.ContainsKey("value"))
+                {
+                    result.Remove("value");
+                }
+            }
+            else if (!result.ContainsKey("value") && cmbValue.Enabled && cmbValue.DropDownStyle == ComboBoxStyle.Simple)
             {
                 result.Add("value", "");
             }
+            if (cmbOperator.SelectedItem is OperatorItem oper && oper.IsMultipleValuesType)
+            {
+                result.Remove("value");
+                result.Remove("valueof");
+            }
             return result;
         }