Changeset 8075

Timestamp:

06/21/12 12:46:54 (13 years ago)

Author:

ascheibe

Message:

#1859 some improvements for the resource permission management ui

Location:

trunk/sources/HeuristicLab.Clients.Hive.Administrator/3.3

Files:

• HiveRoles.cs (modified) (1 diff)
• Views/ResourcesView.Designer.cs (modified) (1 diff)
• Views/ResourcesView.cs (modified) (5 diffs)
• Views/ScheduleView.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Clients.Hive.Administrator/3.3/HiveRoles.cs

@@ -31 +31 @@
 
     public static bool CheckAdminUserPermissions() {
-      UserInformation.Instance.Refresh();
       return UserInformation.Instance.UserExists && UserInformation.Instance.User.Roles.Any(x => x.Name == HiveRoles.Administrator);
     }

trunk/sources/HeuristicLab.Clients.Hive.Administrator/3.3/Views/ResourcesView.Designer.cs

@@ -40 +40 @@
       HiveAdminClient.Instance.Refreshed -= new EventHandler(Instance_Refreshed);
 
-      Access.AccessClient.Instance.Refreshing -= new EventHandler(Content_Refreshing);
-      Access.AccessClient.Instance.Refreshed -= new EventHandler(Content_Refreshed);
+      Access.AccessClient.Instance.Refreshing -= new EventHandler(AccessClient_Refreshing);
+      Access.AccessClient.Instance.Refreshed -= new EventHandler(AccessClient_Refreshed);
       base.Dispose(disposing);
     }

trunk/sources/HeuristicLab.Clients.Hive.Administrator/3.3/Views/ResourcesView.cs

@@ -61 +61 @@
       HiveAdminClient.Instance.Refreshed += new EventHandler(Instance_Refreshed);
 
-      Access.AccessClient.Instance.Refreshing += new EventHandler(Content_Refreshing);
-      Access.AccessClient.Instance.Refreshed += new EventHandler(Content_Refreshed);
+      Access.AccessClient.Instance.Refreshing += new EventHandler(AccessClient_Refreshing);
+      Access.AccessClient.Instance.Refreshed += new EventHandler(AccessClient_Refreshed);
     }
 
@@ -89 +89 @@
       progressTask = new TS.Task(UpdateProgress);
       progressTask.Start();
-      SetEnabledStateOfControls(false);
+      SetEnabledStateOfControls();
     }
 
     void Instance_Refreshed(object sender, EventArgs e) {
       stopProgressTask = true;
-      SetEnabledStateOfControls(true);
-    }
-
-    void Content_Refreshing(object sender, EventArgs e) {
+      SetEnabledStateOfControls();
+    }
+
+    void AccessClient_Refreshing(object sender, EventArgs e) {
       stopProgressTask = false;
       progressTask = new TS.Task(UpdateProgress);
       progressTask.Start();
-      SetEnabledStateOfControls(false);
-    }
-
-    void Content_Refreshed(object sender, EventArgs e) {
+      SetEnabledStateOfControls();
+    }
+
+    void AccessClient_Refreshed(object sender, EventArgs e) {
       stopProgressTask = true;
-      SetEnabledStateOfControls(true);
+      SetEnabledStateOfControls();
     }
 
@@ -199 +199 @@
         btnPermissionsSave.Enabled = false;
         permissionView.Enabled = false;
+        scheduleView.SetEnabledStateOfSchedule(false);
+        btnPermissionsSave.Enabled = false;
+        permissionView.Enabled = false;
       } else {
         btnAddGroup.Enabled = true;
         btnRemoveGroup.Enabled = true;
         btnSave.Enabled = true;
-      }
-    }
-
-    public virtual void SetEnabledStateOfControls(bool state) {
-      if (InvokeRequired) {
-        Invoke(new Action(() => SetEnabledStateOfControls(state)));
-      } else {
-        if (Content == null) state = false;
-        btnAddGroup.Enabled = state;
-        btnRemoveGroup.Enabled = state;
-        btnSave.Enabled = state;
-        scheduleView.SetEnabledStateOfControls(state && IsAuthorized(slaveView.Content));
-        btnPermissionsSave.Enabled = state && permissionView.FetchSelectedUsers != null && Content != null;
-        permissionView.Enabled = state && permissionView.FetchSelectedUsers != null && Content != null;
+        scheduleView.SetEnabledStateOfSchedule(IsAuthorized(slaveView.Content));
+        btnPermissionsSave.Enabled = permissionView.FetchSelectedUsers != null;
+        permissionView.Enabled = permissionView.FetchSelectedUsers != null;
       }
     }
@@ -483 +475 @@
       scheduleView.Invoke(new Action(() => {
         scheduleView.Content = HiveAdminClient.Instance.Downtimes;
-        SetEnabledStateOfControls(currentlyAuthorized);
+        SetEnabledStateOfControls();
       }));
     }
@@ -526 +518 @@
 
     private void btnPermissionsSave_Click(object sender, EventArgs e) {
-      SetEnabledStateOfControls(false);
+      SetEnabledStateOfControls();
       HiveServiceLocator.Instance.CallHiveService(service => {
         service.GrantResourcePermissions(((Resource)treeSlaveGroup.SelectedNode.Tag).Id, permissionView.GetAddedUsers().Select(x => x.Id).ToList());
         service.RevokeResourcePermissions(((Resource)treeSlaveGroup.SelectedNode.Tag).Id, permissionView.GetDeletedUsers().Select(x => x.Id).ToList());
       });
-      SetEnabledStateOfControls(true);
+      SetEnabledStateOfControls();
     }
   }

trunk/sources/HeuristicLab.Clients.Hive.Administrator/3.3/Views/ScheduleView.cs

@@ -230 +230 @@
     }
 
-    public virtual void SetEnabledStateOfControls(bool state) {
+    public virtual void SetEnabledStateOfSchedule(bool state) {
       if (InvokeRequired) {
-        Invoke(new Action(() => SetEnabledStateOfControls(state)));
+        Invoke(new Action(() => SetEnabledStateOfSchedule(state)));
       } else {
         if (Content == null) state = false;