Be smarter, find the relationships. Fixed #710

rappen · May 21, 2022 · beaba40 · beaba40
1 parent 6d11df0
commit beaba40
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/FetchXmlBuilder/Controls/linkEntityControl.cs b/FetchXmlBuilder/Controls/linkEntityControl.cs
@@ -58,7 +58,7 @@ protected override void PopulateControls()
         private void cmbEntity_SelectedIndexChanged(object sender, EventArgs e)
         {
             ValidationSuspended = true;
-            var entity = cmbEntity.SelectedItem.ToString();
+            var entity = cmbEntity.Text ?? cmbEntity.SelectedItem.ToString();
             if (string.IsNullOrEmpty(entity))
             {
                 return;
@@ -142,9 +142,9 @@ private void RefreshAttributes()
             }
             cmbFrom.Items.Clear();
             cmbTo.Items.Clear();
-            if (cmbEntity.SelectedItem != null)
+            var linkentity = cmbEntity.Text ?? cmbEntity.SelectedItem.ToString();
+            if (!string.IsNullOrWhiteSpace(linkentity))
             {
-                var linkentity = cmbEntity.SelectedItem.ToString();
                 cmbFrom.Items.AddRange(GetRelevantLinkAttributes(linkentity));
             }
             var parententity = Node.Parent.Value("name");
@@ -264,12 +264,12 @@ private void cmbRelationship_SelectedIndexChanged(object sender, EventArgs e)
                     return;
                 }
 
-                BeginInit();
+                ValidationSuspended = true;
                 cmbEntity.Text = entity;
                 cmbFrom.Text = from;
                 cmbTo.Text = to;
                 chkIntersect.Checked = intersect;
-                EndInit();
+                ValidationSuspended = false;
                 Save(false);
             }
         }