From 0a757200c1a637f72185e42e1dcdc3345b2c99c1 Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Thu, 10 Oct 2024 11:21:41 +0100 Subject: [PATCH] Bug 10190: Take DefaultToLoggedInLibraryOverdueTriggers into account This updates the logic for the default page load to take account of DefaultToLoggedInLibraryOverdueTriggers. Sponsored-by: Glasgow Colleges Library Group Signed-off-by: George Harkins --- .../prog/en/modules/admin/circulation_triggers.tt | 2 ++ .../Admin/CirculationTriggers/CirculationTriggersList.vue | 7 ++----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/circulation_triggers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/circulation_triggers.tt index 65ca327e7da..3fade533b1c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/circulation_triggers.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/circulation_triggers.tt @@ -1,6 +1,7 @@ [% USE raw %] [% USE To %] [% USE Asset %] +[% USE Branches %] [% USE KohaDates %] [% USE TablesSettings %] [% USE AuthorisedValues %] @@ -33,6 +34,7 @@ [% INCLUDE 'js-date-format.inc' %] [% Asset.js("js/vue/dist/admin/circulation_triggers.js") | $raw %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Admin/CirculationTriggers/CirculationTriggersList.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Admin/CirculationTriggers/CirculationTriggersList.vue index 58843cec69a..f4581445492 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Admin/CirculationTriggers/CirculationTriggersList.vue +++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Admin/CirculationTriggers/CirculationTriggersList.vue @@ -138,7 +138,7 @@ export default { return { initialized: false, libraries: null, - selectedLibrary: "*", + selectedLibrary: default_view, circRules: null, numberOfTabs: [1], tabSelected: "Notice 1", @@ -201,11 +201,8 @@ export default { error => {} ); }, - async getCircRules(params = {}, pageLoad) { + async getCircRules(params = {}) { params.effective = false; - if (pageLoad) { - params.library_id = "*"; - } const client = APIClient.circRule; await client.circRules.getAll({}, params).then( rules => { -- 2.48.1