Filter role list by client

solth · Nov 12, 2024 · ef0d905 · ef0d905
1 parent d9b2746
commit ef0d905
Showing 1 changed file with 0 additions and 7 deletions.
diff --git a/Kitodo/src/main/java/org/kitodo/production/services/data/RoleService.java b/Kitodo/src/main/java/org/kitodo/production/services/data/RoleService.java
@@ -69,9 +69,6 @@ public Long countDatabaseRows() throws DAOException {
 
     @Override
     public Long countResults(Map filters) throws DAOException {
-        if (ServiceManager.getSecurityAccessService().hasAuthorityGlobalToViewRoleList()) {
-            return countDatabaseRows();
-        }
         if (ServiceManager.getSecurityAccessService().hasAuthorityToViewRoleList()) {
             return countDatabaseRows("SELECT COUNT(*) FROM Role AS r INNER JOIN r.client AS c WITH c.id = :clientId",
                     Collections.singletonMap(CLIENT_ID, ServiceManager.getUserService().getSessionClientId()));
@@ -86,11 +83,7 @@ public List<Role> getAllForSelectedClient() {
     }
 
     @Override
-    @SuppressWarnings("unchecked")
     public List<Role> loadData(int first, int pageSize, String sortField, SortOrder sortOrder, Map filters) {
-        if (ServiceManager.getSecurityAccessService().hasAuthorityGlobalToViewRoleList()) {
-            return dao.getByQuery("FROM Role"  + getSort(sortField, sortOrder), filters, first, pageSize);
-        }
         if (ServiceManager.getSecurityAccessService().hasAuthorityToViewRoleList()) {
             return dao.getByQuery("SELECT r FROM Role AS r INNER JOIN r.client AS c WITH c.id = :clientId"
                             + getSort(sortField, sortOrder),