From fdc6b033a55e917647f8f099902f2750e79cc740 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Mon, 24 Apr 2017 12:36:58 +0000
Subject: [PATCH] Bug 18479 - Holds 'Placed on' column in opac-user.pl not
 sorting correctly

Two columns in the user's holds table in the OPAC do not sort correctly
because they are not marked up correctly to enable date sorting: 'Placed
on' and 'Expires on.' This patch corrects it.

This patch also removes a stray </td> which was causing validation
errors.

To test, apply the patch and log into the OPAC with an account which has
multiple holds with differnt hold dates and expiration dates. Confirm
that sorting on these columns works correctly.

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
---
 .../opac-tmpl/bootstrap/en/modules/opac-user.tt  | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
index e8b6d9680b..d322958860 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
@@ -217,8 +217,8 @@ Using this account is not recommended because some parts of Koha will not functi
                                                     <a class="title" href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% ISSUE.biblionumber %]">[% ISSUE.title |html %] [% FOREACH subtitl IN ISSUE.subtitle %] [% subtitl.subfield %][% END %]</a>
                                                     [% IF ( ISSUE.enumchron ) %] [% ISSUE.enumchron %][% END %]
                                                 </td>
+
                                                 <td class="author">[% ISSUE.author %]</td>
-                                                </td>
                                                 [% IF ( ISSUE.overdue ) %]
                                                     <td class="date_due overdue">
                                                         <span title="[% ISSUE.date_due %]">
@@ -542,8 +542,8 @@ Using this account is not recommended because some parts of Koha will not functi
                                     <thead>
                                         <tr>
                                             <th class="anti-the">Title</th>
-                                            <th class="psort">Placed on</th>
-                                            <th>Expires on</th>
+                                            <th class="psort title-string">Placed on</th>
+                                            <th class="title-string">Expires on</th>
                                             <th>Pick up location</th>
                                             [% IF ( showpriority ) %]
                                                 <th>Priority</th>
@@ -589,16 +589,18 @@ Using this account is not recommended because some parts of Koha will not functi
                                             <td class="expirationdate">
                                                 [% IF ! RESERVE.found %]
                                                     [% IF ( RESERVE.expirationdate ) %]
-                                                        <span>
+                                                        <span title="[% RESERVE.expirationdate %]">
                                                             <span class="tdlabel">Expiration:</span>
                                                                 [% RESERVE.expirationdate | $KohaDates %]
                                                         </span>
                                                     [% ELSE %]
-                                                        <span class="tdlabel">Expiration:</span>
-                                                        Never expires
+                                                        <span title="0000-00-00">
+                                                            <span class="tdlabel">Expiration:</span>
+                                                            Never expires
+                                                        </span>
                                                     [% END %]
                                                 [% ELSE %]
-                                                    -
+                                                    <span title="0000-00-00">-</span>
                                                 [% END %]
                                             </td>
                                             <td class="branch">
-- 
2.39.5