gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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 <jonathan.druart@bugs.koha-community.org>
Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit f58099a244)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
(cherry picked from commit 3f0a70a271)
Signed-off-by: Arthur Suzuki <arthur.suzuki@biblibre.com>
This commit is contained in:
Martin Renvoize 2022-07-12 11:22:36 +01:00 committed by Arthur Suzuki
parent aef9262229
commit 041bf720e4
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc
View File

@ -3,11 +3,10 @@
<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 class="title-string">Waiting since</th>
<th class="title-string">Date hold placed</th>
<th>Waiting since</th>
<th>Date hold placed</th>
<th>Expiration date</th>
<th class="anti-the">Title</th>
<th>Patron</th>
<th>Home library</th>
@ -22,11 +21,10 @@
<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 title="[% reserveloo.waitingdate | html %]">[% reserveloo.waitingdate | $KohaDates %]</span></td>
<td><span title="[% reserveloo.reservedate | html %]">[% reserveloo.reservedate | $KohaDates %]</span></td>
<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>
<td>
[% INCLUDE 'biblio-title.inc' biblio=reserveloo.biblio link = 1 %]
[% UNLESS ( item_level_itypes ) %]

4
koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt
View File

@ -93,7 +93,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 %]
@ -118,7 +118,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 %]