fix for MID-8886 Validations are triggered incorrectly

Evolveum · Sep 10, 2023 · 3757bb6 · 3757bb6
1 parent 241e762
commit 3757bb6
Showing 1 changed file with 16 additions and 0 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/PrismValuePanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/PrismValuePanel.java
@@ -6,6 +6,8 @@
  */
 package com.evolveum.midpoint.gui.impl.prism.panel;
 
+import com.evolveum.midpoint.web.util.ExpressionValidator;
+
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.wicket.Component;
 import org.apache.wicket.ajax.AjaxEventBehavior;
@@ -15,6 +17,7 @@
 import org.apache.wicket.feedback.ComponentFeedbackMessageFilter;
 import org.apache.wicket.markup.html.WebMarkupContainer;
 import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.LambdaModel;
 import org.apache.wicket.model.PropertyModel;
 
 import com.evolveum.midpoint.gui.api.component.BasePanel;
@@ -154,6 +157,7 @@ private void createValuePanel(MidpointForm form) {
         panelCtx.setAjaxEventBehavior(createEventBehavior());
         panelCtx.setMandatoryHandler(getMandatoryHandler());
         panelCtx.setVisibleEnableBehaviour(createVisibleEnableBehavior());
+        panelCtx.setExpressionValidator(createExpressionValidator());
         panelCtx.setFeedback(feedback);
 
         Component component;
@@ -171,6 +175,18 @@ private void createValuePanel(MidpointForm form) {
 
     }
 
+    private ExpressionValidator createExpressionValidator() {
+        ItemWrapper itemWrapper = getModelObject().getParent();
+        return new ExpressionValidator(
+                LambdaModel.of(() -> itemWrapper.getFormComponentValidator()), getPageBase()) {
+
+            @Override
+            protected ObjectType getObjectType() {
+                return getObject();
+            }
+        };
+    }
+
     protected void createMetadataPanel(MidpointForm form) {
         PrismValueMetadataPanel metadataPanel = new PrismValueMetadataPanel(ID_METADATA, new PropertyModel<>(getModel(), "valueMetadata"));
         metadataPanel.add(new VisibleBehaviour(() -> getModelObject().isShowMetadata()));