MID-7976 fixed conflict resolving (endless loop removed), count badge…

…s also now working correctly
Evolveum · Aug 17, 2022 · 44326c7 · 44326c7
1 parent 1f37008
commit 44326c7
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/...main/java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/ConflictSolverPanel.java b/...main/java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/ConflictSolverPanel.java
@@ -134,7 +134,7 @@ protected void fixConflictPerformed(AjaxRequestTarget target, IModel<ConflictIte
         add(items);
     }
 
-    private void solveConflictPerformed(AjaxRequestTarget target, IModel<Conflict> conflictModel, IModel<ConflictItem> itemToKeepModel) {
+    protected void solveConflictPerformed(AjaxRequestTarget target, IModel<Conflict> conflictModel, IModel<ConflictItem> itemToKeepModel) {
         Conflict conflict = conflictModel.getObject();
         ConflictItem itemToKeep = itemToKeepModel.getObject();
 

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
@@ -567,8 +567,6 @@ public void solveConflict(Conflict conflict, ConflictItem toRemove) {
 
         conflict.setState(ConflictState.SOLVED);
         conflict.setToBeRemoved(toRemove);
-
-        markConflictsDirty();
     }
 
     public boolean isAllConflictsSolved() {

diff --git a/...c/main/java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/ShoppingCartPanel.java b/...c/main/java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/ShoppingCartPanel.java
@@ -66,17 +66,18 @@ protected void onConfigure() {
     @Override
     public IModel<List<Badge>> getTitleBadges() {
         return () -> {
-            getModelObject().computeConflicts(page);
+            RequestAccess data = getModelObject();
+            data.computeConflicts(page);
 
             List<Badge> badges = new ArrayList<>();
 
-            long warnings = getModelObject().getWarningCount();
+            long warnings = data.getWarningCount();
             if (warnings > 0) {
                 String key = warnings == 1 ? "ShoppingCartPanel.badge.oneWarning" : "ShoppingCartPanel.badge.multipleWarnings";
                 badges.add(new Badge("badge badge-warning", getString(key, warnings)));
             }
 
-            long errors = getModelObject().getErrorCount();
+            long errors = data.getErrorCount();
             if (errors > 0) {
                 String key = errors == 1 ? "ShoppingCartPanel.badge.oneConflict" : "ShoppingCartPanel.badge.multipleConflicts";
                 badges.add(new Badge("badge badge-danger", "fa fa-exclamation-triangle", getString(key, errors)));
@@ -132,6 +133,13 @@ protected void submitPerformed(AjaxRequestTarget target) {
             protected void backToSummaryPerformed(AjaxRequestTarget target) {
                 ShoppingCartPanel.this.onBackPerformed(target);
             }
+
+            @Override
+            protected void solveConflictPerformed(AjaxRequestTarget target, IModel<Conflict> conflictModel, IModel<ConflictItem> itemToKeepModel) {
+                super.solveConflictPerformed(target, conflictModel, itemToKeepModel);
+
+                target.add(getWizard().getHeader());
+            }
         };
         conflictSolver.add(new VisibleBehaviour(() -> state.getObject() == State.CONFLICTS));
         add(conflictSolver);