From 429ee04c38ed3c0bbdfbbceeba74addb3a60a9fe Mon Sep 17 00:00:00 2001
From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Date: Tue, 12 Jul 2022 11:22:36 +0100
Subject: [PATCH] Bug 31141: Template simplification

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 <jonathan.druart@bugs.koha-community.org>
---
 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 4738e44b5e5..687dd75379a 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 @@
 <table class="holds_table" id="[% table_name | html %]">
     <thead>
         <tr>
-            [% IF select_column %]
             <th class="NoSort"><input type="checkbox" class="select_hold_all"/></th>
-            [% END %]
             <th>Waiting since</th>
             <th>Date hold placed</th>
             <th>Expiration date</th>
@@ -23,9 +21,7 @@
     <tbody>
         [% FOREACH reserveloo IN reserveloop %]
             <tr>
-                [% IF select_column %]
                 <th><input type="checkbox" class="select_hold" data-id="[% reserveloo.reserve_id | html %]"/></th>
-                [% END %]
                 <td><span data-order="[% reserveloo.waitingdate | html %]">[% reserveloo.waitingdate | $KohaDates %]</span></td>
                 <td><span data-order="[% reserveloo.reservedate | html %]">[% reserveloo.reservedate | $KohaDates %]</span></td>
                 <td><span data-order="[% reserveloo.expirationdate | html %]">[% reserveloo.expirationdate | $KohaDates %]</span></td>
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 b6e06f7bc95..bccefdb7f1f 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 @@
             <div id="toolbar" class="btn-toolbar">
                 <button class="cancel_selected_holds" data-bulk="true"></button>
             </div>
-            [% 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 %]
             <div class="dialog message">No holds found.</div>
         [% END %]
@@ -120,7 +120,7 @@
                    [% END %]
 
                 </span>
-               [% 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 %]
                 <div class="dialog message">No holds found.</div>
             [% END %]
-- 
2.25.1