fix go back after saving changes on resource object type basic settin…

…gs wizard panel
Evolveum · Apr 29, 2024 · 554542c · 554542c
1 parent f1ee7cf
commit 554542c
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/...ui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/AbstractPageObjectDetails.java b/...ui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/AbstractPageObjectDetails.java
@@ -259,10 +259,23 @@ protected boolean isSaveButtonVisible() {
     }
 
     public boolean hasUnsavedChanges(AjaxRequestTarget target) {
+        return hasUnsavedChanges(false, target);
+    }
+
+    public boolean hasUnsavedChangesInWizard(AjaxRequestTarget target) {
+        return hasUnsavedChanges(true, target);
+    }
+
+    private boolean hasUnsavedChanges(boolean inWizard, AjaxRequestTarget target) {
         OperationResult result = new OperationResult(OPERATION_SAVE);
 
         try {
-            Collection<ObjectDelta<? extends ObjectType>> deltas = getObjectDetailsModels().collectDeltas(result);
+            Collection<ObjectDelta<? extends ObjectType>> deltas;
+            if (inWizard) {
+                deltas = getObjectDetailsModels().collectDeltaWithoutSavedDeltas(result);
+            } else {
+                deltas = getObjectDetailsModels().collectDeltas(result);
+            }
 
             return !deltas.isEmpty();
         } catch (Throwable ex) {

diff --git a/...m/evolveum/midpoint/gui/impl/page/admin/assignmentholder/PageAssignmentHolderDetails.java b/...m/evolveum/midpoint/gui/impl/page/admin/assignmentholder/PageAssignmentHolderDetails.java
@@ -499,7 +499,7 @@ protected void exitFromWizard() {
 
     protected void checkDeltasExitPerformed(SerializableConsumer<AjaxRequestTarget> consumer, AjaxRequestTarget target) {
 
-        if (!hasUnsavedChanges(target)) {
+        if (!hasUnsavedChangesInWizard(target)) {
             consumer.accept(target);
             return;
         }