fix for assignments limit

Evolveum · Aug 20, 2018 · 164d0c2 · 164d0c2
1 parent 3e9d35e
commit 164d0c2
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/...min-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentsUtil.java b/...min-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentsUtil.java
@@ -394,11 +394,12 @@ public static boolean isShoppingCartAssignmentsLimitReached(int assignmentsLimit
     public static int loadAssignmentsLimit(OperationResult result, PageBase pageBase){
         int assignmentsLimit = -1;
         try {
-            SystemConfigurationType sysConfig = pageBase.getModelInteractionService().getSystemConfiguration(result);
-            if (sysConfig != null && sysConfig.getAdminGuiConfiguration() != null && sysConfig.getAdminGuiConfiguration().getRoleManagement() != null){
-                assignmentsLimit = sysConfig.getAdminGuiConfiguration().getRoleManagement().getAssignmentApprovalRequestLimit();
+            AdminGuiConfigurationType adminGuiConfig = pageBase.getModelInteractionService().getAdminGuiConfiguration(
+                    pageBase.createSimpleTask(result.getOperation()), result);
+            if (adminGuiConfig != null && adminGuiConfig.getRoleManagement() != null) {
+                assignmentsLimit = adminGuiConfig.getRoleManagement().getAssignmentApprovalRequestLimit();
             }
-        } catch (ObjectNotFoundException | SchemaException ex){
+        } catch (ObjectNotFoundException | SchemaException ex) {
             LOGGER.error("Error getting system configuration: {}", ex.getMessage(), ex);
         }
         return assignmentsLimit;