Changeset 15635

Timestamp:

01/19/18 22:49:04 (7 years ago)

Author:

swagner

Message:

#2877: Improved groups/slaves treeview of Hive Administrator

• prevented indirect cycles in parent relationshop of groups, which caused an endless loop

File:

• branches/2877_HiveImprovements/HeuristicLab.Clients.Hive.Administrator/3.3/Views/ResourcesView.cs (modified) (1 diff)

branches/2877_HiveImprovements/HeuristicLab.Clients.Hive.Administrator/3.3/Views/ResourcesView.cs

@@ -383 +383 @@
       var group = node?.Tag as SlaveGroup;
 
-      if ((resources != null) && (node != null) && (group != null) && IsAuthorized(group) && (!resources.Contains(group))) {
-        if (e.AllowedEffect.HasFlag(DragDropEffects.Move)) e.Effect = DragDropEffects.Move;
+      if ((resources != null) && (node != null) && (group != null) && IsAuthorized(group) && !resources.Contains(group)) {
+        while ((node != null) && ((group == null) || !resources.Contains(group))) {  // prevent cycles in groups
+          node = node.Parent;
+          group = node?.Tag as SlaveGroup;
+        }
+        if ((node == null) && e.AllowedEffect.HasFlag(DragDropEffects.Move)) e.Effect = DragDropEffects.Move;
       }
     }