From 61ce0eb45befc8ba5c5fe8e69e8dc4e59b413bd0 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Mon, 4 Jul 2022 17:12:24 +0200 Subject: [PATCH] Bug 30650: Display holds waiting at the logged-in library Not those waiting at the library of the logged-in user Signed-off-by: Koha Team University Lyon 3 --- .../intranet-tmpl/prog/en/includes/patron_messages.inc | 3 ++- .../prog/en/modules/circ/curbside_pickups.tt | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron_messages.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron_messages.inc index ffec80fbac1..b9ad41336f7 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron_messages.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron_messages.inc @@ -1,4 +1,5 @@ [% USE raw %] +[% USE Branches %] [% SET ClaimReturnedWarningThreshold = Koha.Preference('ClaimReturnedWarningThreshold') %] [% SET return_claims = patron.return_claims %] [% SET logged_in_branchcode = Branches.GetLoggedInBranchcode() %] @@ -248,7 +249,7 @@ [% END # /IF WaitingHolds.count %] [% IF Koha.Preference("CurbsidePickup") %] - [% SET curbside_pickups = patron.curbside_pickups.search( branchcode => logged_in_user.branchcode ) %] + [% SET curbside_pickups = patron.curbside_pickups.search( branchcode => Branches.GetLoggedInBranchcode ) %] [% IF curbside_pickups.count %]

Curbside pickups scheduled here

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/curbside_pickups.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/curbside_pickups.tt index 07f4e9d80b4..575534c4f43 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/curbside_pickups.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/curbside_pickups.tt @@ -169,7 +169,7 @@ [% END %] - [% SET waiting_holds = cp.patron.holds.search( found => 'W', branchcode => logged_in_user.branchcode ) %] + [% SET waiting_holds = cp.patron.holds.search( found => 'W', branchcode => Branches.GetLoggedInBranchcode ) %] [% FOREACH h IN waiting_holds %] [% h.biblio.title | html %] ([% h.biblio.author | html %], [% h.item.barcode | html %])
[% END %] @@ -239,7 +239,7 @@ [% END %] - [% SET waiting_holds = cp.patron.holds.search( found => 'W', branchcode => logged_in_user.branchcode ) %] + [% SET waiting_holds = cp.patron.holds.search( found => 'W', branchcode => Branches.GetLoggedInBranchcode ) %] [% FOREACH h IN waiting_holds %] [% h.biblio.title | html %] ([% h.biblio.author | html %], [% h.item.barcode | html %])
[% END %] @@ -321,7 +321,7 @@ [% END %] - [% SET waiting_holds = cp.patron.holds.search( found => 'W', branchcode => logged_in_user.branchcode ) %] + [% SET waiting_holds = cp.patron.holds.search( found => 'W', branchcode => Branches.GetLoggedInBranchcode ) %] [% FOREACH h IN waiting_holds %] [% h.biblio.title | html %] ([% h.biblio.author | html %], [% h.item.barcode | html %])
[% END %] @@ -443,7 +443,7 @@ [% ELSE %] - [% SET waiting_holds = patron.holds.search( found => 'W', branchcode => logged_in_user.branchcode ) %] + [% SET waiting_holds = patron.holds.search( found => 'W', branchcode => Branches.GetLoggedInBranchcode ) %] [% IF !policy.enable_waiting_holds_only || waiting_holds.count > 0 %]
-- 2.25.1