Changeset 15767 for branches/2839_HiveProjectManagement/HeuristicLab.Clients.Hive.Administrator/3.3/Views/ResourcesView.cs

Timestamp:

02/13/18 15:32:00 (6 years ago)

Author:

jzenisek

Message:

#2839: fixed cyclic-relation bug in projects- and resources-view by preventing parents from being dragged onto descendants

File:

• branches/2839_HiveProjectManagement/HeuristicLab.Clients.Hive.Administrator/3.3/Views/ResourcesView.cs (modified) (4 diffs)

branches/2839_HiveProjectManagement/HeuristicLab.Clients.Hive.Administrator/3.3/Views/ResourcesView.cs

@@ -308 +308 @@
 
     private void treeSlaveGroup_DragDrop(object sender, DragEventArgs e) {
+      if (e.Effect == DragDropEffects.None) return;
+
       var sourceNode = (TreeNode)e.Data.GetData(typeof(TreeNode));
       if (sourceNode == null) return;
@@ -336 +338 @@
           MessageBoxIcon.Information);
         return;
-      } else if(targetResource != null && targetResource.Id == Guid.Empty) {
+      } else if (targetResource != null && targetResource.Id == Guid.Empty) {
         MessageBox.Show(
           "You cannot drag resources to a not yet stored resource group.",
@@ -342 +344 @@
           MessageBoxButtons.OK,
           MessageBoxIcon.Information);
-            return;
+        return;
+      } else if(!HiveAdminClient.Instance.CheckParentChange(sourceResource, targetResource)) {
+        MessageBox.Show(
+          "You cannot drag resources to this group.",
+          "HeuristicLab Hive Administrator",
+          MessageBoxButtons.OK,
+          MessageBoxIcon.Information);
+        return;
       } else if (targetNode != null && (targetNode.Text == ungroupedGroupName || targetNode.Parent != null && targetNode.Parent.Text == ungroupedGroupName)) {
         MessageBox.Show(
@@ -376 +385 @@
     }
 
-    private void treeSlaveGroup_DragEnter(object sender, DragEventArgs e) {
+    private void treeSlaveGroup_DragEnterOver(object sender, DragEventArgs e) {
       e.Effect = DragDropEffects.Move;
-    }
-
-    private void treeSlaveGroup_DragOver(object sender, DragEventArgs e) {
-      e.Effect = DragDropEffects.Move;
+
+      var sourceNode = (TreeNode)e.Data.GetData(typeof(TreeNode));
+      var sourceResource = ((Resource)sourceNode.Tag);
+
+      var targetPoint = treeView.PointToClient(new Point(e.X, e.Y));
+      var targetNode = treeView.GetNodeAt(targetPoint);
+      var targetResource = (targetNode != null) ? (Resource)targetNode.Tag : null;
+
+      if(!IsAdmin() 
+        || sourceNode == null 
+        || sourceResource == null 
+        || sourceNode == targetNode
+        || (targetResource != null && targetResource is Slave)
+        || (targetResource != null && targetResource.Id == Guid.Empty)
+        || (targetResource != null && targetResource.Id == sourceResource.ParentResourceId)
+        || !HiveAdminClient.Instance.CheckParentChange(sourceResource, targetResource)
+        || (targetNode != null && (targetNode.Text == ungroupedGroupName || targetNode.Parent != null && targetNode.Parent.Text == ungroupedGroupName))) {
+        e.Effect = DragDropEffects.None;
+      }
     }