one more update for unassignAllMembers authorization

Evolveum · Jun 19, 2018 · 3a943f7 · 3a943f7
1 parent 74af785
commit 3a943f7
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 11 deletions.
diff --git a/...rc/main/java/com/evolveum/midpoint/web/page/admin/roles/RoleGovernanceRelationsPanel.java b/...rc/main/java/com/evolveum/midpoint/web/page/admin/roles/RoleGovernanceRelationsPanel.java
@@ -254,9 +254,4 @@ public boolean isOwner() {
 		}
 	}
 
-    @Override
-    protected boolean isAuthorizedToUnassignAllMembers(){
-        return true;
-    }
-
 }
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/RoleMemberPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/RoleMemberPanel.java
@@ -439,11 +439,6 @@ protected ObjectQuery createDirectMemberQuery(List<QName> relations) {
 		}
 	}
 
-	@Override
-	protected boolean isAuthorizedToUnassignAllMembers(){
-		return WebComponentUtil.isAuthorized(AuthorizationConstants.AUTZ_UI_ADMIN_UNASSIGN_ALL_MEMBERS_TAB_ACTION_URI);
-	}
-
 	@Override
 	protected List<QName> getNewMemberSupportedTypes(){
 		return WebComponentUtil.createFocusTypeList();

diff --git a/...in/java/com/evolveum/midpoint/web/page/admin/users/component/AbstractRoleMemberPanel.java b/...in/java/com/evolveum/midpoint/web/page/admin/users/component/AbstractRoleMemberPanel.java
@@ -276,7 +276,7 @@ protected boolean isAuthorizedToUnassignMembers(){
 	}
 
 	protected boolean isAuthorizedToUnassignAllMembers(){
-		return true;
+		return WebComponentUtil.isAuthorized(AuthorizationConstants.AUTZ_UI_ADMIN_UNASSIGN_ALL_MEMBERS_TAB_ACTION_URI);
 	}
 
 	protected boolean isAuthorizedToDeleteMembers(){