manual merging for preview changes page

Evolveum · Aug 23, 2018 · f001bcc · f001bcc
1 parent 99175cf
commit f001bcc
Showing 1 changed file with 15 additions and 9 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminObjectDetails.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminObjectDetails.java
@@ -462,10 +462,8 @@ public void saveOrPreviewPerformed(AjaxRequestTarget target, OperationResult res
 
         Task task = createSimpleTask(OPERATION_SEND_TO_SUBMIT);
 
-        ModelExecuteOptions options = getExecuteChangesOptions();
-        if (previewOnly) {
-            options.getOrCreatePartialProcessing().setApprovals(PartialProcessingTypeType.PROCESS);
-        }
+        ModelExecuteOptions options = getOptions(previewOnly);
+
         LOGGER.debug("Using execute options {}.", options);
 
         try {
@@ -556,17 +554,21 @@ public void saveOrPreviewPerformed(AjaxRequestTarget target, OperationResult res
                             return;
                         }
                         progressPanel.executeChanges(deltas, previewOnly, options, task, result, target);
+                    } else if (previewOnly && delta.isEmpty() && delegationChangesExist){
+                        progressPanel.executeChanges(deltas, previewOnly, options, task, result, target);
                     } else {
                         progressPanel.clearProgressPanel();			// from previous attempts (useful only if we would call finishProcessing at the end, but that's not the case now)
                         if (!previewOnly) {
-                            if (!isAnythingChanged) {
+                            if (!delegationChangesExist) {
                                 result.recordWarning(getString("PageAdminObjectDetails.noChangesSave"));
                                 showResult(result);
                             }
                             redirectBack();
                         } else {
-                            warn(getString("PageAdminObjectDetails.noChangesPreview"));
-                            target.add(getFeedbackPanel());
+                            if (!delegationChangesExist) {
+                                warn(getString("PageAdminObjectDetails.noChangesPreview"));
+                                target.add(getFeedbackPanel());
+                            }
                         }
                     }
 
@@ -622,8 +624,12 @@ public void startProcessing(AjaxRequestTarget target, OperationResult result) {
     }
 
     @NotNull
-    protected ModelExecuteOptions getEisaxecuteChangesOptions() {
-        return mainPanel.getExecuteChangeOptionsDto().createOptions();
+    protected ModelExecuteOptions getOptions(boolean previewOnly) {
+        ModelExecuteOptions options = mainPanel.getExecuteChangeOptionsDto().createOptions();
+        if (previewOnly) {
+            options.getOrCreatePartialProcessing().setApprovals(PartialProcessingTypeType.PROCESS);
+        }
+        return options;
     }
 
     protected void prepareObjectForAdd(PrismObject<O> object) throws SchemaException {