Attachment 172661 Details for Bug 10190 – Bug 10190: Take DefaultToLoggedInLibraryOverdueTriggers into account

[patch] Bug 10190: Take DefaultToLoggedInLibraryOverdueTriggers into account

Bug-10190-Take-DefaultToLoggedInLibraryOverdueTrig.patch (text/plain), 2.66 KB, created by Martin Renvoize (ashimema) on 2024-10-10 16:21:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2024-10-10 16:21:29 UTC

Size: 2.66 KB

patch

obsolete

>From 6642284c564ca28989ca546a8590249bd3f11711 Mon Sep 17 00:00:00 2001
>From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>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 <https://library.cityofglasgowcollege.ac.uk>
>Signed-off-by: George Harkins <George.Harkins@cityofglasgowcollege.ac.uk>
>---
> .../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 57ba3129856..9162f0c769d 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 %]
>@@ -32,6 +33,7 @@
>     <script>
> 
>         const letters = [% To.json(letters) | $raw %];
>+        const default_view = "[%- IF Koha.Preference('DefaultToLoggedInLibraryOverdueTriggers') -%][% Branches.GetLoggedInBranchcode %][%- ELSE -%]*[%- END -%]";
> 
>     </script>
> 
>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 bc276972680..6e91e7a514b 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.47.0

Actions: View | Diff | Splinter Review

Attachments on bug 10190: 170357 | 170358 | 170359 | 170360 | 170361 | 170362 | 170363 | 170364 | 170365 | 170366 | 170367 | 170368 | 170369 | 170370 | 170371 | 170372 | 170373 | 170374 | 170375 | 170376 | 170380 | 170449 | 171727 | 171728 | 171729 | 171730 | 171731 | 171732 | 171733 | 171734 | 171735 | 171736 | 171737 | 171738 | 171739 | 171740 | 171741 | 171742 | 171743 | 171744 | 171745 | 171746 | 171747 | 171748 | 171749 | 171750 | 171751 | 171752 | 171753 | 171754 | 171755 | 172588 | 172589 | 172590 | 172591 | 172592 | 172593 | 172594 | 172595 | 172596 | 172597 | 172598 | 172599 | 172600 | 172601 | 172602 | 172603 | 172604 | 172605 | 172606 | 172607 | 172608 | 172609 | 172612 | 172614 | 172617 | 172619 | 172621 | 172622 | 172623 | 172624 | 172625 | 172626 | 172630 | 172631 | 172632 | 172633 | 172634 | 172635 | 172636 | 172637 | 172638 | 172639 | 172640 | 172641 | 172642 | 172643 | 172644 | 172645 | 172646 | 172647 | 172648 | 172649 | 172650 | 172651 | 172652 | 172653 | 172654 | 172655 | 172656 | 172657 | 172658 | 172659 | 172660 | 172661 | 172662 | 172663