From 927954dda58075bfac9cd979eb693a103a7db321 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliver=20St=C3=B6hr?= Date: Thu, 2 Jan 2025 16:34:30 +0100 Subject: [PATCH] Do not update results while editing filter --- Kitodo/src/main/webapp/WEB-INF/resources/js/filter.js | 4 ++-- .../WEB-INF/templates/includes/processes/filterMenu.xhtml | 4 ++++ .../webapp/WEB-INF/templates/includes/tasks/filterMenu.xhtml | 4 ++++ .../webapp/WEB-INF/templates/includes/users/filterMenu.xhtml | 4 ++++ 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/Kitodo/src/main/webapp/WEB-INF/resources/js/filter.js b/Kitodo/src/main/webapp/WEB-INF/resources/js/filter.js index 7beb0f9ae59..cc9221397a1 100644 --- a/Kitodo/src/main/webapp/WEB-INF/resources/js/filter.js +++ b/Kitodo/src/main/webapp/WEB-INF/resources/js/filter.js @@ -8,7 +8,7 @@ * For the full copyright and license information, please read the * GPL3-License.txt file that was distributed with this source code. */ -/* globals removeFilter, updateSuggestions, submitFilters, filterKeydownEvents */ +/* globals removeFilter, removeFilterForEdit, updateSuggestions, submitFilters, filterKeydownEvents */ /* Define identifiers used to select elements */ const FILTER_INPUT_FORM = "#filterInputForm"; @@ -192,7 +192,7 @@ $(document).ready(function () { let filter = target.siblings(".plainFilter").length ? target.siblings(".plainFilter").first().text() : target.find(".plainFilter").first().text(); $(FILTER_INPUT).val(filter); - removeFilter([{name: "plainFilter", value: filter}]); + removeFilterForEdit([{name: "plainFilter", value: filter}]); $(FILTER_INPUT).focus(); } }); diff --git a/Kitodo/src/main/webapp/WEB-INF/templates/includes/processes/filterMenu.xhtml b/Kitodo/src/main/webapp/WEB-INF/templates/includes/processes/filterMenu.xhtml index bd40308d5fc..8e49eafce79 100644 --- a/Kitodo/src/main/webapp/WEB-INF/templates/includes/processes/filterMenu.xhtml +++ b/Kitodo/src/main/webapp/WEB-INF/templates/includes/processes/filterMenu.xhtml @@ -22,6 +22,10 @@ update="processesTabView:processesForm:processesTable parsedFiltersForm:parsedFilters processCount"/> + diff --git a/Kitodo/src/main/webapp/WEB-INF/templates/includes/tasks/filterMenu.xhtml b/Kitodo/src/main/webapp/WEB-INF/templates/includes/tasks/filterMenu.xhtml index fb9c5754eca..1b8f152f2a5 100644 --- a/Kitodo/src/main/webapp/WEB-INF/templates/includes/tasks/filterMenu.xhtml +++ b/Kitodo/src/main/webapp/WEB-INF/templates/includes/tasks/filterMenu.xhtml @@ -21,6 +21,10 @@ action="#{CurrentTaskForm.filterMenu.removeFilter}" oncomplete="setFilterInputPadding()" update="tasksTabView:tasksForm:taskTable parsedFiltersForm:parsedFilters"/> + diff --git a/Kitodo/src/main/webapp/WEB-INF/templates/includes/users/filterMenu.xhtml b/Kitodo/src/main/webapp/WEB-INF/templates/includes/users/filterMenu.xhtml index 228a6031a94..eb59ab2e9d1 100644 --- a/Kitodo/src/main/webapp/WEB-INF/templates/includes/users/filterMenu.xhtml +++ b/Kitodo/src/main/webapp/WEB-INF/templates/includes/users/filterMenu.xhtml @@ -20,6 +20,10 @@ action="#{UserForm.filterMenu.removeFilter}" oncomplete="setFilterInputPadding()" update="usersTabView:usersTable parsedFiltersForm:parsedFilters"/> +