Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Bug 32503: (follow-up) Move data-order attributes

Browse source 
It looks like the data-order attributes were at the wrong level to me,
i.e. not part of the 'td' but instead part of the cell content.

This patch moves those data-order attributes where possible and drops
the data-type definitions on the headers.

However, for the cancellation case, this isn't as clear cut as we may
well display more than one cancellation request date in the same cell.
For this case I've left Katrins data-type="@data-order" trick.

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit d76a6cb104)
Signed-off-by: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>
This commit is contained in:
Martin Renvoize 2022-12-29 11:33:47 +00:00 committed by Matt Blenkinsop
parent 23cbb6fb1e
commit 3f2f6cce8e
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc
View file

@ -5,12 +5,12 @@
<thead>
<tr>
<th class="NoSort"><input type="checkbox" class="select_hold_all"/></th>
<th data-type="@data-sort">Waiting since</th>
<th data-type="@data-sort">Date hold placed</th>
<th>Waiting since</th>
<th>Date hold placed</th>
[% IF table_name == 'holdscr' %]
<th data-type="@data-sort">Date cancellation requested</th>
[% END %]
<th data-type="@data-sort">Expiration date</th>
<th>Expiration date</th>
<th class="anti-the">Title</th>
<th>Patron</th>
<th>Home library</th>
@ -26,8 +26,8 @@
[% FOREACH reserveloo IN reserveloop %]
<tr>
<th><input type="checkbox" class="select_hold" data-id="[% reserveloo.reserve_id | html %]"/></th>
<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 data-order="[% reserveloo.waitingdate | html %]"><span>[% reserveloo.waitingdate | $KohaDates %]</span></td>
<td data-order="[% reserveloo.reservedate | html %]"><span>[% reserveloo.reservedate | $KohaDates %]</span></td>
[% IF table_name == 'holdscr' %]
<td>
[% FOREACH cancellation_request IN reserveloo.cancellation_requests %]
@ -35,7 +35,7 @@
[% END %]
</td>
[% END %]
<td><span data-order="[% reserveloo.expirationdate | html %]">[% reserveloo.expirationdate | $KohaDates %]</span></td>
<td data-order="[% reserveloo.expirationdate | html %]"><span>[% reserveloo.expirationdate | $KohaDates %]</span></td>
<td>
[% INCLUDE 'biblio-title.inc' biblio=reserveloo.biblio link = 1 %]
[% UNLESS ( item_level_itypes ) %]