parametric search items removal fix

Evolveum · Sep 28, 2022 · 39b3daf · 39b3daf
1 parent 327d394
commit 39b3daf
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/...rc/main/java/com/evolveum/midpoint/gui/impl/component/search/AbstractSearchItemPanel.java b/...rc/main/java/com/evolveum/midpoint/gui/impl/component/search/AbstractSearchItemPanel.java
@@ -187,6 +187,7 @@ protected void searchPerformed(AjaxRequestTarget target){
 
     private void deletePerformed(AjaxRequestTarget target) {
         getModelObject().setVisible(false);
+        getModelObject().setValue(getModelObject().getDefaultValue());
         SearchPanel panel = findParent(SearchPanel.class);
         panel.displayedSearchItemsModelReset();
         panel.refreshSearchForm(target);

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/Search.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/Search.java
@@ -374,7 +374,7 @@ public VariablesMap getFilterVariables(VariablesMap defaultVariables, PageBase p
         VariablesMap variables = defaultVariables == null ? new VariablesMap() : defaultVariables;
         List<AbstractSearchItemWrapper> items = getItems();
         items.forEach(item -> {
-            if (StringUtils.isNotEmpty(item.getParameterName()) && item.isApplyFilter(SearchBoxModeType.BASIC)) {
+            if (StringUtils.isNotEmpty(item.getParameterName())) {
                 Object parameterValue = item.getValue() != null ? item.getValue().getValue() : null;
                 TypedValue value = new TypedValue(parameterValue, item.getParameterValueType());
                 variables.put(item.getParameterName(), value);

diff --git a/...dmin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/SearchFactory.java b/...dmin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/SearchFactory.java
@@ -471,7 +471,6 @@ public static  <C extends Containerable> PropertySearchItemWrapper createPropert
             if (searchItemWrapper instanceof DateSearchItemWrapper) {
                 ((DateSearchItemWrapper) searchItemWrapper).setInterval(false);
             }
-            searchItemWrapper.setCanConfigure(false);
         }
 
         if (item.isVisibleByDefault() != null) {