From f72d2dac432c26aa64b637ba795a930b7e72e4a2 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Tue, 15 Apr 2014 15:32:34 -0400 Subject: [PATCH] Bug 11719 [Follow-up 2] Use new DataTables include in serials templates 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 --- .../prog/en/modules/serials/claims.tt | 23 ++++++++++------------ .../prog/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 df18395..34c6d8c 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 @@ Vendor Library - Title + Title ISSN Issue number Status - Since - Claim date + Since + Claim date [% FOREACH missingissue IN missingissues %] 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 894773a..426c602 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']], -- 1.9.1