From d0950e61944628645c51b912e02f49732c599dd3 Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Mon, 14 Dec 2015 12:18:33 +0000
Subject: [PATCH] Bug 15285: Update for 3 specific tables
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

The checkouts, currency and items lost tables redefine the dom/sDom and
the older C(olvis) should be replaced with the current B(utton).

Test plan:
To test the whole patch set, you will have to test the 4 tables impacted
by this patch as well as the others using the columns settings.

The additem has specific code and should be tested keeping that in mind.

Signed-off-by: Marc Véron <veron@veron.ch>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>

Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
---
 koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js        |  2 +-
 .../intranet-tmpl/prog/en/modules/admin/currency.tt    | 10 ++++------
 .../intranet-tmpl/prog/en/modules/reports/itemslost.tt |  2 +-
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js b/koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js
index 3c079606a6..5137b7d30d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js
+++ b/koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js
@@ -174,7 +174,7 @@ $(document).ready(function() {
                 "sProcessing": MSG_DT_LOADING_RECORDS,
             },
             "bAutoWidth": false,
-            "sDom": 'C<"clearfix">rt',
+            "dom": 'B<"clearfix">rt',
             "aoColumns": [
                 {
                     "mDataProp": function( oObj ) {
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt
index 6c94bb242e..e1268c75fa 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt
@@ -27,14 +27,12 @@
     $(document).ready(function() {
         columns_settings = [% ColumnsSettings.GetColumns( 'admin', 'currency', 'currencies-table', 'json' ) %]
         var issuest = KohaTable("#currencies-table", {
-            "sDom": 'C<"clearfix">t',
-            "aaSorting": [],
-            "aoColumnDefs": [
+            dom: 'B<"clearfix">t',
+            "columnDefs": [
                 { "aTargets": [ -1 ], "bSortable": false, "bSearchable": false },
                 { "sType": "title-string", "aTargets" : [ "title-string" ] }
-            ],
-            "bPaginate": false,
-        }, columns_settings);
+                ],
+        }, columns_settings );
 
         // prevents users to check active with a currency != 1
         $("#rate").keyup(function() {
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tt
index e72f446c41..ae6535ed0f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tt
@@ -11,7 +11,7 @@
     $(document).ready(function() {
         var columns_settings = [% ColumnsSettings.GetColumns( 'reports', 'lostitems', 'lostitems-table', 'json' ) %];
         var lostitems_table = KohaTable("#lostitems-table", {
-            "sDom": 'C<"clearfix">t',
+            "dom": 'B<"clearfix">t',
             "aaSorting": [],
             "aoColumnDefs": [
                 { "aTargets": [ -1 ], "bSortable": false, "bSearchable": false },
-- 
2.39.5