From 9babb3dc3d8baaf2b95d220a868090324b0e3f72 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Mon, 10 Feb 2014 12:26:34 -0500 Subject: [PATCH] Bug 11734 - Use new DataTables include in batch modification templates Bug 10649 introduced a new include file for adding DataTables-related JavaScript assets. This patch adds use of this include file to the batch modification and batch deletion pages. Minor text changes: Corrected capitalization. Apply the patch and test the following: - On batch modification and batch deletion, submit multiple barcodes or item numbers. On the results page the title column has been configured to use the "anti-the" filter to exclude articles from sorting. Sorting on all columns should work correctly. Edit: Put back checkboxes plugin which was accidentally removed. Signed-off-by: Kyle M Hall Signed-off-by: Katrin Fischer Works as described, passes all tests and QA script. Signed-off-by: Galen Charlton (cherry picked from commit 7349f847fad28ada0eb98cd5ebb44d563d7ee0f7) Signed-off-by: Fridolin Somers --- koha-tmpl/intranet-tmpl/prog/en/js/pages/batchMod.js | 3 ++- .../prog/en/modules/tools/batchMod-del.tt | 10 ++++------ .../prog/en/modules/tools/batchMod-edit.tt | 10 ++++------ 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/pages/batchMod.js b/koha-tmpl/intranet-tmpl/prog/en/js/pages/batchMod.js index 38f971e3c7..19abef35c6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/js/pages/batchMod.js +++ b/koha-tmpl/intranet-tmpl/prog/en/js/pages/batchMod.js @@ -100,7 +100,8 @@ function hideAllColumns(){ $("#itemst").dataTable($.extend(true, {}, dataTablesDefaults, { "sDom": 't', "aoColumnDefs": [ - { "aTargets": [ 0 ], "bSortable": false, "bSearchable": false } + { "aTargets": [ 0 ], "bSortable": false, "bSearchable": false }, + { "sType": "anti-the", "aTargets" : [ "anti-the" ] } ], "bPaginate": false, })); diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt index f93509ad71..9cd4d33992 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt @@ -3,10 +3,8 @@ [% INCLUDE 'doc-head-close.inc' %] +[% INCLUDE 'datatables.inc' %] - -[% INCLUDE 'datatables-strings.inc' %] - - - -[% INCLUDE 'datatables-strings.inc' %] - +[% INCLUDE 'datatables.inc' %] +