Corrected property PrimaryIdNode

rappen · Aug 7, 2022 · b508010 · b508010
1 parent baf352a
commit b508010
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/FetchXmlBuilder/DockControls/TreeBuilderControl.cs b/FetchXmlBuilder/DockControls/TreeBuilderControl.cs
@@ -191,7 +191,11 @@ internal FetchXmlElementControlBase GetCurrentControl()
 
         internal TreeNode PrimaryIdNode =>
             tvFetch.Nodes.Cast<TreeNode>()?
-                .FirstOrDefault(n => n.Name == "attribute" && n.Parent?.Name == "entity" && n.Value("name") == PrimaryIdName);
+               .FirstOrDefault(n => n.Name == "fetch")?
+                .Nodes.Cast<TreeNode>()?
+                .FirstOrDefault(n => n.Name == "entity")?
+                .Nodes.Cast<TreeNode>()?
+                .FirstOrDefault(n => n.Name == "attribute" && n.Value("name") == PrimaryIdName);
 
         private int GetUniqueLinkEntitySuffix(TreeNode entity)
         {