Changeset 15955

Timestamp:

06/08/18 09:43:29 (6 years ago)

Author:

jzenisek

Message:

#2839:

• fixed refresh in resource view
• fixed assignment/include behavior in permission view

Location:

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

Files:

• ProjectPermissionsView.cs (modified) (3 diffs)
• ProjectResourcesView.cs (modified) (1 diff)

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

@@ -169 +169 @@
     private void UpdateNewAssignedPermissions() {
       for(int i = newAssignedPermissions.Count-1; i >= 0; i--) {
-        if(newAssignedPermissions.Intersect(userGroupAncestors[newAssignedPermissions.ElementAt(i).Id]).Any()) {
+        if(newAssignedPermissions.Intersect(userGroupAncestors[newAssignedPermissions.ElementAt(i).Id]).Any() 
+          && newAssignedPermissions.ElementAt(i).Id != Content.OwnerUserId) {
           newAssignedPermissions.Remove(newAssignedPermissions.ElementAt(i));
         }
@@ -181 +182 @@
         if(userGroupDescendants.ContainsKey(item.Id)) {
           foreach(var descendant in userGroupDescendants[item.Id]) {
-            inheritedPermissions.Add(descendant);
-            newInheritedPermissions.Add(descendant);
+            if(!assignedPermissions.Contains(descendant)) {
+              inheritedPermissions.Add(descendant);
+              newInheritedPermissions.Add(descendant);
+            }
           }
         }
@@ -193 +196 @@
         if(userGroupDescendants.ContainsKey(item.Id)) {
           foreach(var descendant in userGroupDescendants[item.Id]) {
-            newInheritedPermissions.Add(descendant);
+            if(!newAssignedPermissions.Contains(descendant))
+              newInheritedPermissions.Add(descendant);
           }
         }

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

@@ -125 +125 @@
           SetAssignedProjectResources(Content.Id, newAssignedResources.Select(x => x.Id), false, false, false);
         });
+      HiveAdminClient.Instance.Refresh();
       UpdateResourceTree();
     }