From ab94355f91a12fb9c4d8b78b3c5cb359a0dbfd3d Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Tue, 15 Apr 2014 15:32:34 -0400
Subject: [PATCH] Bug 11719: (follow-up) fixed two more sorting issues

This second follow-up addresses QA issues:

- Corrected sorting on claims page while converting sorting
  configuration to up-to-date method.
- Removed sorting from routing list column on serial collection page.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
---
 .../prog/en/modules/serials/claims.tt         | 23 ++++++++-----------
 .../en/modules/serials/serials-collection.tt  |  6 +----
 2 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt
index df183958b1..34c6d8cfe0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt
@@ -12,18 +12,15 @@
         [% UNLESS ( preview ) %]
          var sTable = $("#claimst").dataTable($.extend(true, {}, dataTablesDefaults, {
             "sDom": 't',
-            [% IF ( letter ) %]
                 "aoColumnDefs": [
-                    { "aTargets": [ 0,1 ], "bSortable": false, "bSearchable": false }
+                    [% IF ( letter ) %]
+                        { "aTargets": [ 0,1 ], "bSortable": false, "bSearchable": false },
+                    [% ELSE %]
+                        { "aTargets": [ 0 ], "bSortable": false, "bSearchable": false },
+                    [% END %]
+                    { 'sType': "anti-the", 'aTargets' : [ 'anti-the'] },
+                    { 'sType': "title-string", 'aTargets' : [ 'title-string'] }
                 ],
-            [% ELSE %]
-                "aoColumnDefs": [
-                    { "aTargets": [ 0 ], "bSortable": false, "bSearchable": false }
-                ],
-            [% END %]
-            "aoColumns": [
-                [% IF ( letter ) %]null,[% END %]null,null,{ "sType": "anti-the" },null,null,{ "sType": "title-string" },{ "sType": "title-string" }
-        ],
             "bPaginate": false
         }));
         [% END %]
@@ -268,12 +265,12 @@
                     <th><input type="checkbox" id="CheckAll"></th>
                     <th>Vendor</th>
                     <th>Library</th>
-                    <th>Title</th>
+                    <th class="anti-the">Title</th>
                     <th>ISSN</th>
                     <th>Issue number</th>
                     <th>Status</th>
-                    <th>Since</th>
-                    <th>Claim date</th>
+                    <th class="title-string">Since</th>
+                    <th class="title-string">Claim date</th>
                 </tr></thead>
                 <tbody>[% FOREACH missingissue IN missingissues %]
                     <tr>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt
index f5596a50a9..bd025d7428 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt
@@ -60,13 +60,9 @@ function CheckNone( node ) {
 }
 $(document).ready(function() {
     $('#subscription_years').tabs();
-    [% IF dateformat == "metric" %]
-      dt_add_type_uk_date();
-    [% END %]
-
     $(".subscription-year-table").dataTable($.extend(true, {}, dataTablesDefaults, {
         "aoColumnDefs": [
-            { "aTargets": [ 0 ], "bSortable": false, "bSearchable": false },
+            { "aTargets": [ 0,-1 ], "bSortable": false, "bSearchable": false },
             { "sType": "title-string", "aTargets" : [ "title-string" ] }
         ],
         "aaSorting": [[0, 'desc']],
-- 
2.39.5