MID-8365 fix for activation dates editing in shopping cart

Evolveum · Jan 2, 2023 · e90da5a · e90da5a
1 parent 53f8e94
commit e90da5a
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/...in/java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/ShoppingCartEditPanel.java b/...in/java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/ShoppingCartEditPanel.java
@@ -359,11 +359,13 @@ protected void savePerformed(AjaxRequestTarget target, IModel<ShoppingCartItem>
             // this is just a nasty "pre-save" code to handle assignment extension via wrappers -> apply it to our assignment stored in request access
             PrismContainerValueWrapper<AssignmentType> containerValueWrapper = assignmentExtension.getObject();
             if (containerValueWrapper == null) {
+                updateSelectedAssignment();
                 return;
             }
 
             PrismObjectWrapper<UserType> wrapper = containerValueWrapper.getParent().findObjectWrapper();
             if (wrapper.getObjectDelta().isEmpty()) {
+                updateSelectedAssignment();
                 return;
             }
 
@@ -372,20 +374,26 @@ protected void savePerformed(AjaxRequestTarget target, IModel<ShoppingCartItem>
             // that second assignment contains modified extension...very nasty hack
             List<AssignmentType> assignments = user.getAssignment();
             if (assignments.size() < 2) {
+                updateSelectedAssignment();
                 return;
             }
             AssignmentType modified = user.getAssignment().get(1);
 
             AssignmentType a = getModelObject().getAssignment();
             a.setExtension(modified.getExtension());
 
-            requestAccess.getObject().updateSelectedAssignment(a);
+            updateSelectedAssignment();
         } catch (SchemaException ex) {
             getPageBase().error(getString("ShoppingCartEditPanel.message.couldntProcessExtension", ex.getMessage()));
             LOGGER.debug("Couldn't process extension attributes", ex);
         }
     }
 
+    private void updateSelectedAssignment() {
+        AssignmentType a = getModelObject().getAssignment();
+        requestAccess.getObject().updateSelectedAssignment(a);
+    }
+
     protected void closePerformed(AjaxRequestTarget target, IModel<ShoppingCartItem> model) {
 
     }