MID-9280: evaluate expression in filter for selecting of target on re…

…quest access page
Evolveum · Jan 19, 2024 · 88fb273 · 88fb273
1 parent c00962a
commit 88fb273
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/...in/java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/PersonOfInterestPanel.java b/...in/java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/PersonOfInterestPanel.java
@@ -69,6 +69,7 @@ public class PersonOfInterestPanel extends BasicWizardStepPanel<RequestAccess> i
     private static final String DOT_CLASS = RelationPanel.class.getName() + ".";
     private static final String OPERATION_LOAD_USERS = DOT_CLASS + "loadUsers";
     private static final String OPERATION_COMPILE_TARGET_SELECTION_COLLECTION = DOT_CLASS + "compileTargetSelectionCollection";
+    private static final String OPERATION_EVALUATE_FILTER_EXPRESSION = DOT_CLASS + "evaluateFilterExpression";
 
     private static final int MULTISELECT_PAGE_SIZE = 10;
 
@@ -535,7 +536,9 @@ private void selectManuallyPerformed(AjaxRequestTarget target) {
         Tile<PersonOfInterest> selected = getSelectedTile();
         if (selected != null) {
             String identifier = selected.getValue().groupIdentifier;
-            filter = createObjectFilterFromGroupSelection(identifier);
+            filter = WebComponentUtil.evaluateExpressionsInFilter(
+                    createObjectFilterFromGroupSelection(identifier),
+                    new OperationResult(OPERATION_EVALUATE_FILTER_EXPRESSION), page);
         }
 
         ObjectBrowserPanel<UserType> panel = new ObjectBrowserPanel<>(page.getMainPopupBodyId(), UserType.class,