- Timestamp:
- 09/25/17 17:20:15 (7 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/HiveProjectManagement/HeuristicLab.Services.Hive/3.3/HiveService.cs
r15379 r15380 636 636 public void DeleteProject(Guid projectId) { 637 637 RoleVerifier.AuthenticateForAnyRole(HiveRoles.Administrator); 638 AuthorizationManager.AuthorizeFor ResourceAdministration(projectId);638 AuthorizationManager.AuthorizeForProjectAdministration(projectId); 639 639 var pm = PersistenceManager; 640 640 using (new PerformanceLogger("DeleteProject")) { … … 665 665 var currentUserId = UserManager.CurrentUserId; 666 666 return pm.UseTransaction(() => { 667 var resourcePermissions = projectPermissionDao.GetAll();667 var projectPermissions = projectPermissionDao.GetAll(); 668 668 return projectDao.GetAll().ToList() 669 669 .Where(x => isAdministrator 670 670 || x.OwnerUserId == currentUserId 671 || UserManager.VerifyUser(currentUserId, resourcePermissions671 || UserManager.VerifyUser(currentUserId, projectPermissions 672 672 .Where(y => y.ProjectId == x.ProjectId) 673 673 .Select(z => z.GrantedUserId) … … 684 684 public void GrantProjectPermissions(Guid projectId, Guid[] grantedUserIds) { 685 685 RoleVerifier.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client); 686 AuthorizationManager.AuthorizeForProjectAdministration(projectId); 686 687 var pm = PersistenceManager; 687 688 using (new PerformanceLogger("GrantProjectPermissions")) { … … 704 705 public void RevokeProjectPermissions(Guid projectId, Guid[] grantedUserIds) { 705 706 RoleVerifier.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client); 707 AuthorizationManager.AuthorizeForProjectAdministration(projectId); 706 708 var pm = PersistenceManager; 707 709 using (new PerformanceLogger("RevokeProjectPermissions")) { 708 710 var projectPermissionDao = pm.ProjectPermissionDao; 709 711 pm.UseTransaction(() => { 710 AuthorizeForProject(pm, projectId);711 712 projectPermissionDao.DeleteByProjectAndGrantedUserId(projectId, grantedUserIds); 712 713 pm.SubmitChanges();
Note: See TracChangeset
for help on using the changeset viewer.