Changeset 15813 for branches/2839_HiveProjectManagement/HeuristicLab.Services.Hive/3.3/Manager

Timestamp:

02/26/18 13:38:05 (7 years ago)

Author:

jzenisek

Message:

#2839: improved HiveAdmin interactions:

• collaps groups with slaves only
• update scheduleView only if currently visible
• made schedule scrollable for non-admins
• changed selection backcolor
• fixed add/delete project permission bug for non-admins

File:

• branches/2839_HiveProjectManagement/HeuristicLab.Services.Hive/3.3/Manager/AuthorizationManager.cs (modified) (4 diffs)

branches/2839_HiveProjectManagement/HeuristicLab.Services.Hive/3.3/Manager/AuthorizationManager.cs

@@ -93 +93 @@
     // authorize if user is admin, project owner or owner of a parent project
     public void AuthorizeForProjectAdministration(Guid projectId, bool parentalOwnership) {
-      if (projectId == null) return;
+      if (projectId == null || projectId == Guid.Empty) return;
       var currentUserId = UserManager.CurrentUserId;
       var pm = PersistenceManager;
@@ -99 +99 @@
       pm.UseTransaction(() => {
         List<Project> projectBranch = null;
-        if(parentalOwnership) projectDao.GetParentProjectsById(projectId).ToList();
+        if(parentalOwnership) projectBranch = projectDao.GetParentProjectsById(projectId).ToList();
         else projectBranch = projectDao.GetCurrentAndParentProjectsById(projectId).ToList();
 
@@ -111 +111 @@
     // authorize if user is admin, or owner of a parent project, for which the resources are assigned to
     public void AuthorizeForProjectResourceAdministration(Guid projectId, IEnumerable<Guid> resourceIds) {
-      if (projectId == null) return;
+      if (projectId == null || projectId == Guid.Empty) return;
       var currentUserId = UserManager.CurrentUserId;
       var pm = PersistenceManager;
@@ -146 +146 @@
     // Check if a project is authorized to use a list of resources
     public void AuthorizeProjectForResourcesUse(Guid projectId, IEnumerable<Guid> resourceIds) {
-      if (projectId == null || resourceIds == null || !resourceIds.Any()) return;
+      if (projectId == null || projectId == Guid.Empty || resourceIds == null || !resourceIds.Any()) return;
       var pm = PersistenceManager;
       var assignedProjectResourceDao = pm.AssignedProjectResourceDao;