Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Do not update results while editing filter #6360

Merged
merged 1 commit into from
Jan 7, 2025
Merged

Do not update results while editing filter #6360

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Kitodo/src/main/webapp/WEB-INF/resources/js/filter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down Expand Up @@ -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();
}
});
Expand Down
4 changes: 4 additions & 0 deletions Kitodo/src/main/webapp/WEB-INF/templates/includes/processes/filterMenu.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@
update="processesTabView:processesForm:processesTable
parsedFiltersForm:parsedFilters
processCount"/>
<p:remoteCommand name="removeFilterForEdit"
action="#{ProcessForm.filterMenu.removeFilter}"
oncomplete="setFilterInputPadding()"
update="parsedFiltersForm:parsedFilters"/>
<p:remoteCommand name="updateSuggestions"
action="#{ProcessForm.filterMenu.updateSuggestions}"
update="filterOptionsForm:suggestions"/>
Expand Down
4 changes: 4 additions & 0 deletions Kitodo/src/main/webapp/WEB-INF/templates/includes/tasks/filterMenu.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@
action="#{CurrentTaskForm.filterMenu.removeFilter}"
oncomplete="setFilterInputPadding()"
update="tasksTabView:tasksForm:taskTable parsedFiltersForm:parsedFilters"/>
<p:remoteCommand name="removeFilterForEdit"
action="#{CurrentTaskForm.filterMenu.removeFilter}"
oncomplete="setFilterInputPadding()"
update="parsedFiltersForm:parsedFilters"/>
<p:remoteCommand name="updateSuggestions"
action="#{CurrentTaskForm.filterMenu.updateSuggestions}"
update="filterOptionsForm:suggestions"/>
Expand Down
4 changes: 4 additions & 0 deletions Kitodo/src/main/webapp/WEB-INF/templates/includes/users/filterMenu.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@
action="#{UserForm.filterMenu.removeFilter}"
oncomplete="setFilterInputPadding()"
update="usersTabView:usersTable parsedFiltersForm:parsedFilters"/>
<p:remoteCommand name="removeFilterForEdit"
action="#{UserForm.filterMenu.removeFilter}"
oncomplete="setFilterInputPadding()"
update="parsedFiltersForm:parsedFilters"/>
<p:remoteCommand name="updateSuggestions"
action="#{UserForm.filterMenu.updateSuggestions}"
update="filterOptionsForm:suggestions"/>
Expand Down
Loading