Changeset 16203 for trunk/HeuristicLab.Services.Hive/3.3/HiveService.cs

Timestamp:

10/01/18 15:18:23 (6 years ago)

Author:

jzenisek

Message:

#2839: fixed job listing method for hive administrators

File:

• trunk/HeuristicLab.Services.Hive/3.3/HiveService.cs (modified) (2 diffs)

trunk/HeuristicLab.Services.Hive/3.3/HiveService.cs

@@ -355 +355 @@
         return pm.UseTransaction(() => {
           // check if user is granted to administer the requested projectId
-          var administrationGrantedProjects = projectDao
-            .GetAdministrationGrantedProjectsForUser(currentUserId)
-            .ToList();
+          bool isAdmin = RoleVerifier.IsInRole(HiveRoles.Administrator);
+          List<DA.Project> administrationGrantedProjects;
+          if (isAdmin) {
+            administrationGrantedProjects = projectDao.GetAll().ToList();
+          } else {
+            administrationGrantedProjects = projectDao
+              .GetAdministrationGrantedProjectsForUser(currentUserId)              
+              .ToList();
+          }
 
           if (administrationGrantedProjects.Select(x => x.ProjectId).Contains(projectId)) {
@@ -382 +388 @@
         return pm.UseTransaction(() => {
           // check for which of requested projectIds the user is granted to administer
-          var administrationGrantedProjectIds = projectDao
-            .GetAdministrationGrantedProjectsForUser(currentUserId)
-            .Select(x => x.ProjectId)
-            .ToList();
+          bool isAdmin = RoleVerifier.IsInRole(HiveRoles.Administrator);
+          List<Guid> administrationGrantedProjectIds;
+          if (isAdmin) {
+            administrationGrantedProjectIds = projectDao.GetAll().Select(x => x.ProjectId).ToList();
+          } else {
+            administrationGrantedProjectIds = projectDao
+              .GetAdministrationGrantedProjectsForUser(currentUserId)
+              .Select(x => x.ProjectId)
+              .ToList();
+          }
           var requestedAndGrantedProjectIds = projectIds.Intersect(administrationGrantedProjectIds);