From d2bb65a7f96d1531bd8dabcffe11e37cab0bf571 Mon Sep 17 00:00:00 2001 From: Henning Gerhardt Date: Mon, 18 Nov 2024 08:46:24 +0100 Subject: [PATCH 1/2] Enable CI on 3.8.x release branch --- .github/workflows/codeql.yml | 3 ++- .github/workflows/main.yml | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index be469dc888e..ecb4ada9840 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -14,7 +14,8 @@ name: "CodeQL" on: push: pull_request: - branches: [ master ] + branches: + - 3.8.x # Allows you to run this workflow manually from the Actions tab workflow_dispatch: diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e4b88c595b8..11bd798f2b5 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -4,10 +4,11 @@ name: CI # Controls when the action will run. on: - # Triggers the workflow on push and pull request events but only for pull_requests on the master branch + # Triggers the workflow on push and pull request events but only for pull_requests on the 3.8.x release branch push: pull_request: - branches: [ master ] + branches: + - 3.8.x # Allows you to run this workflow manually from the Actions tab workflow_dispatch: From bbe7e5675e29d04ae85d3c8d5893d1cd67a50117 Mon Sep 17 00:00:00 2001 From: Arved Solth Date: Tue, 19 Nov 2024 15:18:33 +0100 Subject: [PATCH 2/2] Update hit count when removing filter on process list page --- .../WEB-INF/templates/includes/processes/filterMenu.xhtml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) 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 260bc9f926c..bd40308d5fc 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 @@ -19,7 +19,9 @@ + update="processesTabView:processesForm:processesTable + parsedFiltersForm:parsedFilters + processCount"/> @@ -60,7 +62,9 @@ icon="fa fa-times" action="#{ProcessForm.filterMenu.removeFilter(parsedFilter)}" oncomplete="setFilterInputPadding()" - update="processesTabView:processesForm:processesTable parsedFilters"/> + update="processesTabView:processesForm:processesTable + parsedFilters + processCount"/>