Incorrect warning about order with friendly names. Fixed #932

rappen · Jul 30, 2023 · da87a0c · da87a0c
1 parent 0c4e4cb
commit da87a0c
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/FetchXmlBuilder/Controls/orderControl.cs b/FetchXmlBuilder/Controls/orderControl.cs
@@ -86,7 +86,8 @@ protected override ControlValidationResult ValidateControl(Control control)
                 }
                 if (fxb.entities != null)
                 {
-                    if (!allattributes.Any(a => a.LogicalName == cmbAttribute.Text))
+                    var attributename = (cmbAttribute.SelectedItem is AttributeItem item && item.Metadata != null) ? item.Metadata.LogicalName : cmbAttribute.Text;
+                    if (!allattributes.Any(a => a.LogicalName == attributename))
                     {
                         return new ControlValidationResult(ControlValidationLevel.Warning, "Attribute", ControlValidationMessage.NotInMetadata);
                     }