Changeset 15580

Timestamp:

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

Author:

jzenisek

Message:

#2839

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

Location:

branches/HiveProjectManagement

Files:

• HeuristicLab.Clients.Access.Administration/3.3/Views/UserGroupView.cs (modified) (2 diffs)
• HeuristicLab.Clients.Access.Views/3.3/UserViews/LightweightUserView.cs (modified) (1 diff)
• HeuristicLab.Clients.Access.Views/3.3/UserViews/RefreshableLightweightUserView.cs (modified) (2 diffs)
• HeuristicLab.Clients.Hive.Administrator/3.3/Views/ProjectPermissionsView.cs (modified) (3 diffs)
• HeuristicLab.Services.Hive/3.3/HiveService.cs (modified) (1 diff)

branches/HiveProjectManagement/HeuristicLab.Clients.Access.Administration/3.3/Views/UserGroupView.cs

@@ -74 +74 @@
       idTextBox.ReadOnly = !enabled;
       storeButton.Enabled = enabled;
-      refreshableLightweightUserView.Enabled = enabled;
-      //refreshableLightweightUserView.Locked = !enabled;
+      //refreshableLightweightUserView.Enabled = enabled;
+      refreshableLightweightUserView.Locked = !enabled;
       //refreshableLightweightUserView.ReadOnly = !enabled;
     }
@@ -102 +102 @@
 
     private void Content_Refreshing(object sender, EventArgs e) {
-      storeButton.Enabled = false;
+      if (!Locked) storeButton.Enabled = false;
     }
 
     private void refreshableLightweightUserView_StorableStateChanged(object sender, EventArgs e) {
-      storeButton.Enabled = true;
+      if (!Locked) storeButton.Enabled = true;
     }
   }

branches/HiveProjectManagement/HeuristicLab.Clients.Access.Views/3.3/UserViews/LightweightUserView.cs

@@ -59 +59 @@
       base.SetEnabledStateOfControls();
       this.showDetailsCheckBox.Enabled = false;
+      bool enabled = Content != null && !Locked;
+      addButton.Enabled = enabled;
+      removeButton.Enabled = enabled;
+      moveDownButton.Enabled = enabled;
+      moveUpButton.Enabled = enabled;
     }
 

branches/HiveProjectManagement/HeuristicLab.Clients.Access.Views/3.3/UserViews/RefreshableLightweightUserView.cs

@@ -58 +58 @@
     }
 
+    protected override void SetEnabledStateOfControls() {
+      base.SetEnabledStateOfControls();
+      refreshButton.Enabled = FetchSelectedUsers != null && Content != null;
+      lightweightUserView.Locked = Locked;
+    }
+
     protected override void RefreshData() {
       Action completeRefreshAction = new Action(delegate {
@@ -79 +85 @@
         if (lightweightUserView.Content != null) OnStorableStateChanged();
       }
-    }
-
-    protected override void SetEnabledStateOfControls() {
-      base.SetEnabledStateOfControls();
-      refreshButton.Enabled = FetchSelectedUsers != null && Content != null;
     }
 

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)) {

branches/HiveProjectManagement/HeuristicLab.Services.Hive/3.3/HiveService.cs

@@ -861 +861 @@
               // remove project permissions
               if(reassignCascading) {
-                p.AssignedProjectResources.Clear();
+                p.ProjectPermissions.Clear();
               } else {
                 foreach(var item in p.ProjectPermissions.ToList().Where(x => removedPermissions.Contains(x.GrantedUserId))) {