Changeset 15658 for branches/HiveProjectManagement/HeuristicLab.Clients.Hive/3.3/HiveAdminClient.cs

Timestamp:

01/26/18 08:51:30 (6 years ago)

Author:

jzenisek

Message:

#2839

• worked on (restricted) accessibility of hive's administration area for non-admin roles
• adapted HiveClient & HiveAdminClient entity loading (client- & service-side)

File:

• branches/HiveProjectManagement/HeuristicLab.Clients.Hive/3.3/HiveAdminClient.cs (modified) (5 diffs)

branches/HiveProjectManagement/HeuristicLab.Clients.Hive/3.3/HiveAdminClient.cs

@@ -24 +24 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
+using System.Collections.Generic;
 
 namespace HeuristicLab.Clients.Hive {
@@ -36 +37 @@
     }
 
+    #region Properties
     private IItemList<Resource> resources;
     public IItemList<Resource> Resources {
@@ -62 +64 @@
     }
 
+    #endregion
+
     #region Events
     public event EventHandler Refreshing;
@@ -86 +90 @@
 
         HiveServiceLocator.Instance.CallHiveService(service => {
-          service.GetSlaveGroups().ForEach(g => resources.Add(g));
-          service.GetSlaves().ForEach(s => resources.Add(s));
+          service.GetSlaveGroupsForAdministration().ForEach(g => resources.Add(g));
+          service.GetSlavesForAdministration().ForEach(s => resources.Add(s));
           service.GetProjectsForAdministration().ForEach(p => projects.Add(p));
         });
@@ -174 +178 @@
       }
     }
+
+    #region
+    public bool CheckAccessToAdminAreaGranted() {
+      if(projects != null) {
+        return projects.Count > 0;
+      } else {
+        bool accessGranted = false;
+        HiveServiceLocator.Instance.CallHiveService(s => {
+          accessGranted = s.CheckAccessToAdminAreaGranted();
+        });
+        return accessGranted;
+      }
+    }
+    #endregion
   }
 }