Changeset 15580 for branches/HiveProjectManagement/HeuristicLab.Clients.Hive.Administrator/3.3

Timestamp:

01/08/18 12:45:15 (7 years ago)

Author:

jzenisek

Message:

#2839

• minor bugfix in HiveService.cs
• corrected behavior of ProjectPermissionsView

File:

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

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

@@ -44 +44 @@
     private readonly Dictionary<Guid, HashSet<UserGroupBase>> userGroupDescendants = new Dictionary<Guid, HashSet<UserGroupBase>>();
 
+    private IEnumerable<UserGroupBase> addedPermissions;
+    private IEnumerable<UserGroupBase> removedPermissions;
+    private IEnumerable<UserGroupBase> addedIncludes;
+    private IEnumerable<UserGroupBase> removedIncludes;
+
     private readonly Color addedAssignmentColor = Color.FromArgb(255, 87, 191, 193); // #57bfc1
     private readonly Color removedAssignmentColor = Color.FromArgb(255, 236, 159, 72); // #ec9f48
@@ -215 +220 @@
 
     private UserGroupBase BuildPermissionsList(IEnumerable<UserGroupBase> usersAndGroups) {
+      addedPermissions = newAssignedPermissions.Except(assignedPermissions);
+      removedPermissions = assignedPermissions.Except(newAssignedPermissions);
+      addedIncludes = newInheritedPermissions.Except(inheritedPermissions);
+      removedIncludes = inheritedPermissions.Except(newInheritedPermissions);
+
       treeView.Nodes.Clear();
       if (!usersAndGroups.Any()) return null;
@@ -259 +269 @@
 
     private void BuildNode(UserGroupBase ug, TreeNode node) {
-      var addedPermissions = newAssignedPermissions.Except(assignedPermissions);
-      var removedPermissions = assignedPermissions.Except(newAssignedPermissions);
-      var addedIncludes = newInheritedPermissions.Except(inheritedPermissions);
-      var removedIncludes = inheritedPermissions.Except(newInheritedPermissions);
 
       if (newAssignedPermissions.Contains(ug)) {