diff --git a/Kitodo/src/main/java/org/kitodo/production/controller/SecurityAccessController.java b/Kitodo/src/main/java/org/kitodo/production/controller/SecurityAccessController.java index f851cac086a..6a018b36c20 100644 --- a/Kitodo/src/main/java/org/kitodo/production/controller/SecurityAccessController.java +++ b/Kitodo/src/main/java/org/kitodo/production/controller/SecurityAccessController.java @@ -956,6 +956,24 @@ public boolean hasAuthorityGlobalToAddOrEditRole() { return securityAccessService.hasAuthorityGlobalToAddOrEditRole(); } + /** + * Checks if current user has global authority for editing roles. + * + * @return true if current user has global authority for editing roles + */ + public boolean hasAuthorityGlobalToEditRole() { + return securityAccessService.hasAuthorityGlobalToEditRole(); + } + + /** + * Checks if current user has global authority for viewing a role. + * + * @return true if current user has global authority for editing a role + */ + public boolean hasAuthorityGlobalToViewRole() { + return securityAccessService.hasAuthorityGlobalToViewRole(); + } + /** * Checks if current user has authority to configure displayed columns in list * views. diff --git a/Kitodo/src/main/java/org/kitodo/production/services/security/SecurityAccessService.java b/Kitodo/src/main/java/org/kitodo/production/services/security/SecurityAccessService.java index b7d3cdbb619..7af73223135 100644 --- a/Kitodo/src/main/java/org/kitodo/production/services/security/SecurityAccessService.java +++ b/Kitodo/src/main/java/org/kitodo/production/services/security/SecurityAccessService.java @@ -889,6 +889,25 @@ public boolean hasAuthorityGlobalToAddOrEditRole() { return hasAnyAuthorityGlobal("addRole, editRole"); } + /** + * Checks if current user has global authority for editing a role. + * + * @return true if current user has global authority for editing a role + */ + public boolean hasAuthorityGlobalToEditRole() { + return hasAnyAuthorityGlobal("editRole"); + } + + /** + * Checks if current user has global authority for viewing a role. + * Having the authority to edit a role also grants permission to view it inherently. + * + * @return true if current user has global authority for editing a role + */ + public boolean hasAuthorityGlobalToViewRole() { + return hasAnyAuthorityGlobal("viewRole, editRole"); + } + /** * Check if current user has global authority to view role list. It returns true * if user has "viewAllRoles" authority globally. diff --git a/Kitodo/src/main/webapp/WEB-INF/templates/includes/roleEdit/details.xhtml b/Kitodo/src/main/webapp/WEB-INF/templates/includes/roleEdit/details.xhtml index 503a33fe4f9..9b2f3234e53 100644 --- a/Kitodo/src/main/webapp/WEB-INF/templates/includes/roleEdit/details.xhtml +++ b/Kitodo/src/main/webapp/WEB-INF/templates/includes/roleEdit/details.xhtml @@ -42,18 +42,20 @@ - - + +

+

- +