Revert "some improvements for available filter deletion"

This reverts commit 6771d95
Evolveum · Oct 6, 2022 · e09d92e · e09d92e
1 parent 07ee41b
commit e09d92e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/.../java/com/evolveum/midpoint/gui/impl/component/button/SelectableItemListPopoverPanel.java b/.../java/com/evolveum/midpoint/gui/impl/component/button/SelectableItemListPopoverPanel.java
@@ -187,9 +187,6 @@ public void onClick(AjaxRequestTarget target) {
 
             @Override
             public void onClick(AjaxRequestTarget target) {
-                String popoverId = SelectableItemListPopoverPanel.this.get(ID_POPOVER).getMarkupId();
-                target.appendJavaScript("$('#" + popoverId + "').toggle();");
-
                 removeItemsPerformed(getSelectedItemList(), target);
             }
         };

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/SearchPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/SearchPanel.java
@@ -276,7 +276,7 @@ protected boolean isAddButtonVisible() {
                     @Override
                     protected void removeItemsPerformed(List<AvailableFilterWrapper> items, AjaxRequestTarget target){
                         DeleteConfirmationPanel confirmationPanel = new DeleteConfirmationPanel(getPageBase().getMainPopupBodyId(),
-                                getDeleteFilterConfirmationMessageModel(items)) {
+                                createStringResource("OperationalButtonsPanel.deletePerformed")) {
                             private static final long serialVersionUID = 1L;
 
                             @Override
@@ -331,7 +331,7 @@ public void onClick(AjaxRequestTarget target) {
     }
 
     private void saveSearchFilterPerformed(AjaxRequestTarget target) {
-        savedSearchListModel.reset();
+        savedSearchListModel.detach();
         target.add(SearchPanel.this.get(ID_FORM));
     }
 
@@ -367,7 +367,6 @@ private void deleteFilterPerformed(List<AvailableFilterWrapper> items, AjaxReque
         }
         result.computeStatusIfUnknown();
         getPageBase().showResult(result);
-        savedSearchListModel.reset();
         target.add(getPageBase().getFeedbackPanel());
         target.add(get(ID_FORM));
     }