request access wizard: take into account systemConfiguration/roleMana…

…gement/defaultExecuteAfterAllApprovals when submitting new request
Evolveum · Feb 19, 2024 · 61e6e35 · 61e6e35
1 parent 43f7680
commit 61e6e35
Showing 1 changed file with 12 additions and 0 deletions.
diff --git a/...i/src/main/java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/RequestAccess.java b/...i/src/main/java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/RequestAccess.java
@@ -774,6 +774,8 @@ private OperationResult submitMultiRequest(PageBase page) {
 
                 ModelExecuteOptions options = createSubmitModelOptions(page.getPrismContext());
                 options.initialPartialProcessing(new PartialProcessingOptionsType().inbound(SKIP).projection(SKIP));
+                boolean executeImmediately = isDefaultExecuteAfterAllApprovals(page);
+                options.executeImmediatelyAfterApproval(executeImmediately);
                 request.setExecutionOptions(options.toModelExecutionOptionsType());
 
                 PrismObject<UserType> user = WebModelServiceUtils.loadObject(poiRef, page);
@@ -970,6 +972,16 @@ private RelationSelectionType getRelationConfiguration(Page page) {
         return relation != null ? relation : new RelationSelectionType();
     }
 
+    private Boolean isDefaultExecuteAfterAllApprovals(Page page) {
+        SystemConfigurationType config = MidPointApplication.get().getSystemConfigurationIfAvailable();
+        if (config == null || config.getRoleManagement() == null) {
+            return null;
+        }
+
+        RoleManagementConfigurationType roleManagement = config.getRoleManagement();
+        return roleManagement.isDefaultExecuteAfterAllApprovals();
+    }
+
     public AccessRequestType getAccessRequestConfiguration(Page page) {
         CompiledGuiProfile profile = WebComponentUtil.getCompiledGuiProfile(page);
         if (profile == null) {