From d673e0387e040170830b57cba0db9ce3aa8c67b0 Mon Sep 17 00:00:00 2001 From: Nick Clemens Date: Mon, 24 Jun 2019 11:54:56 +0000 Subject: [PATCH] Bug 23192: Correct tab input on waiting_holds.inc To test: 1 - Place 2 holds 2 - Confirm the holds 3 - In the db change the expiration date: UPDATE reserves SET expirationdate = '2019-01-01'; 4 - Go to Home->Circulation->Holds awaiting pickup 5 - View your holds on the 'Holds waiting over' tab 6 - Inspect the cancel button for one of the holds, note tab = "holdswaiting" 7 - Apply patch 8 - Refresh the page 9 - Inspect the buttton, note tab = "holdsover" 10 - Cancel the hold 11 - Note you return to the holds over tab Signed-off-by: Maryse Simard Signed-off-by: Katrin Fischer Signed-off-by: Martin Renvoize (cherry picked from commit f45516e73ab6ac8c2240f206bd11a88e4935359c) Signed-off-by: Fridolin Somers --- koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc | 2 +- .../intranet-tmpl/prog/en/modules/circ/waitingreserves.tt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc index 2bdf8c7c1d..8ffa7df776 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc @@ -49,7 +49,7 @@ - + [% IF ( reserveloo.item.homebranch != reserveloo.item.holdingbranch ) %] [% ELSE %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt index 6bc433117f..528cee5aa8 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt @@ -73,7 +73,7 @@
[% IF ( reserveloop ) %] - [% INCLUDE waiting_holds.inc table_name='holdst' reserveloop=reserveloop %] + [% INCLUDE waiting_holds.inc table_name='holdst' reserveloop=reserveloop tab='holdwaiting' %] [% ELSE %]
No holds found.
[% END %] @@ -96,7 +96,7 @@ Only items that need not be transferred will be cancelled (TransferWhenCancelAllWaitingHolds syspref) [% END %] - [% INCLUDE waiting_holds.inc table_name='holdso' reserveloop=overloop %] + [% INCLUDE waiting_holds.inc table_name='holdso' reserveloop=overloop tab='holdsover' %] [% ELSE %]
No holds found.
[% END %] -- 2.39.5