Changeset 15576 for branches/HiveProjectManagement/HeuristicLab.Clients.Hive.Administrator/3.3/Views/ProjectResourcesView.cs

Timestamp:

01/05/18 15:10:38 (6 years ago)

Author:

jzenisek

Message:

#2839 worked on client side mgmt of project-resource assignments and project-user permissions

File:

• branches/HiveProjectManagement/HeuristicLab.Clients.Hive.Administrator/3.3/Views/ProjectResourcesView.cs (modified) (7 diffs)

branches/HiveProjectManagement/HeuristicLab.Clients.Hive.Administrator/3.3/Views/ProjectResourcesView.cs

@@ -97 +97 @@
     }
 
-    private void inheritButton_Click(object sender, EventArgs e) {
-      return;
-      SetAssignedProjectResources(Content.Id, Enumerable.Empty<Guid>());
-      UpdateAssignedResources();
-      UpdateResourceGenealogy();
-      var top = BuildResourceTree(HiveAdminClient.Instance.Resources);
-      detailsViewHost.Content = top;
+    private async void inheritButton_Click(object sender, EventArgs e) {
+      await SecurityExceptionUtil.TryAsyncAndReportSecurityExceptions(
+        action: () => {
+          SetAssignedProjectResources(Content.Id, newAssignedResources.Select(x => x.Id), false, true);
+        });
+      UpdateResourceTree();
     }
 
@@ -109 +108 @@
       await SecurityExceptionUtil.TryAsyncAndReportSecurityExceptions(
         action: () => {
-          SetAssignedProjectResources(Content.Id, newAssignedResources.Select(x => x.Id));
+          SetAssignedProjectResources(Content.Id, newAssignedResources.Select(x => x.Id), false, false);
         });
       UpdateResourceTree();
@@ -132 +131 @@
       }
 
-      UpdateNewAssignedResources();
-      UpdateNewInheritedResources();
-      var top = BuildResourceTree(HiveAdminClient.Instance.Resources);
-      detailsViewHost.Content = top;
+      UpdateNewResourceTree();
     }
     #endregion
 
     #region Helpers
-
-    //private void DisableResourceTree(TreeNode node) {
-    //  foreach(var n in node.Nodes) {
-
-    //  }
-    //}
 
     private void UpdateResourceTree() {
@@ -154 +144 @@
     }
 
+    private void UpdateNewResourceTree() {
+      UpdateNewAssignedResources();
+      UpdateNewInheritedResources();
+      var top = BuildResourceTree(HiveAdminClient.Instance.Resources);
+      detailsViewHost.Content = top;
+    }
+
     private static IEnumerable<Resource> GetAssignedResourcesForProject(Guid projectId) {
       var assignedProjectResources = HiveServiceLocator.Instance.CallHiveService(s => s.GetAssignedResourcesForProject(projectId));
@@ -159 +156 @@
     }
 
-    private void SetAssignedProjectResources(Guid projectId, IEnumerable<Guid> resourceIds) {
+    private void SetAssignedProjectResources(Guid projectId, IEnumerable<Guid> resourceIds, bool reassign, bool cascading) {
+      if (projectId == null || resourceIds == null) return;
       HiveServiceLocator.Instance.CallHiveService(s => {
-        var currentlyAssignedResources = s.GetAssignedResourcesForProject(projectId);
-        s.UnassignProjectResources(projectId, currentlyAssignedResources.Select(x => x.ResourceId).ToList());
-        s.AssignProjectResources(projectId, resourceIds.ToList());
+       s.SaveProjectResourceAssignments(projectId, resourceIds.ToList(), reassign, cascading, true);
       });
     }
@@ -295 +291 @@
           newNode.BackColor = addedIncludeColor;
           newNode.ForeColor = SystemColors.GrayText;
-          newNode.Text += " [+included]";
+          newNode.Text += " [added include]";
         } else if (removedIncludes.Contains(newResource)) {
           newNode.BackColor = removedIncludeColor;
-          newNode.Text += " [-included]";
+          newNode.Text += " [removed include]";
         }
 
@@ -304 +300 @@
           newNode.BackColor = addedAssignmentColor;
           newNode.ForeColor = SystemColors.ControlText;
-          newNode.Text += " [added]";
+          newNode.Text += " [added assignment]";
         } else if (removedAssignments.Contains(newResource)) {
           newNode.BackColor = removedAssignmentColor;
           newNode.ForeColor = SystemColors.ControlText;
-          newNode.Text += " [removed]";
+          newNode.Text += " [removed assignment]";
         }