From 3f0a70a271bda696b9e39b162faca1c504a980b8 Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Tue, 12 Jul 2022 11:22:36 +0100 Subject: [PATCH] Bug 31141: Remove 'select_column' from waiting_holds.inc In the only place we use the waiting_holds include, we were hard coded to always pass the 'select_column' variable as true. We can simply and clarify the logic by just removing this superflous variable. Test plan 1. Confirm that the waiting holds tables continue to display as expected Signed-off-by: Jonathan Druart Signed-off-by: David Nind Signed-off-by: Tomas Cohen Arazi (cherry picked from commit f58099a2440a8482b09ae14df89c1cd6eb43c5d6) Signed-off-by: Lucas Gass --- koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc | 4 ---- .../intranet-tmpl/prog/en/modules/circ/waitingreserves.tt | 4 ++-- 2 files changed, 2 insertions(+), 6 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 4738e44b5e..687dd75379 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc @@ -3,9 +3,7 @@ - [% IF select_column %] - [% END %] @@ -23,9 +21,7 @@ [% FOREACH reserveloo IN reserveloop %] - [% IF select_column %] - [% END %] 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 b6e06f7bc9..bccefdb7f1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt @@ -95,7 +95,7 @@
- [% INCLUDE waiting_holds.inc select_column='1' table_name='holdst' reserveloop=reserveloop tab='holdwaiting' %] + [% INCLUDE waiting_holds.inc table_name='holdst' reserveloop=reserveloop tab='holdwaiting' %] [% ELSE %]
No holds found.
[% END %] @@ -120,7 +120,7 @@ [% END %] - [% INCLUDE waiting_holds.inc select_column='1' table_name='holdso' reserveloop=overloop tab='holdsover' %] + [% INCLUDE waiting_holds.inc table_name='holdso' reserveloop=overloop tab='holdsover' %] [% ELSE %]
No holds found.
[% END %] -- 2.39.5
Waiting since Date hold placed Expiration date
[% reserveloo.waitingdate | $KohaDates %] [% reserveloo.reservedate | $KohaDates %] [% reserveloo.expirationdate | $KohaDates %]