Attachment 47264 Details for Bug 15285 – Bug 15285: Update for 3 specific tables

[patch] Bug 15285: Update for 3 specific tables

Bug-15285-Update-for-3-specific-tables.patch (text/plain), 3.36 KB, created by Marc Véron on 2016-01-25 15:22:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marc Véron

Created: 2016-01-25 15:22:38 UTC

Size: 3.36 KB

patch

obsolete

>From 200014bc3ff81c4ec08a5d5106515b029a9af913 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=UTF-8
>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>
>---
> koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js              |    2 +-
> koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt    |   10 ++++------
> koha-tmpl/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 3c07960..5137b7d 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 6c94bb2..e1268c7 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 e72f446..ae6535e 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 },
>-- 
>1.7.10.4

Actions: View | Diff | Splinter Review

Attachments on bug 15285: 45639 | 45640 | 45641 | 46484 | 46485 | 46683 | 46686 | 47261 | 47263 | 47264 | 47266 | 47688 | 47689 | 47690 | 47691