Attachment 116436 Details for Bug 27646 – Bug 27646: Allow export of Acqusitions home and Funds tables

[patch] Bug 27646: Allow export of Acqusitions home and Funds tables

Bug-27646-Allow-export-of-Acqusitions-home-and-Fun.patch (text/plain), 3.65 KB, created by PTFS Europe Sandboxes on 2021-02-05 22:11:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: PTFS Europe Sandboxes

Created: 2021-02-05 22:11:39 UTC

Size: 3.65 KB

patch

obsolete

>From 6b42f7a616184cdbf7d1c276cfe3e24f75090e01 Mon Sep 17 00:00:00 2001
>From: Nick Clemens <nick@bywatersolutions.com>
>Date: Fri, 5 Feb 2021 19:38:03 +0000
>Subject: [PATCH] Bug 27646: Allow export of Acqusitions home and Funds tables
>
>This patch swtiches these tables ot use KohaTables with exporting enabled
>
>To test:
>1 - Apply patch
>2 - Confirm acquisitions home and funds tables display correctly
>3 - Confirm you can export the tables
>
>Signed-off-by: Barbara Johnson <barbara.johnson@bedfordtx.gov>
>---
> koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt | 6 +++---
> koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt  | 6 +++---
> 2 files changed, 6 insertions(+), 6 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt
>index 0990427fca..c9b7296017 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt
>@@ -197,12 +197,13 @@
>     [% INCLUDE 'datatables.inc' %]
>     [% Asset.js("lib/jquery/plugins/treetable/jquery.treetable.js") | $raw %]
>     [% Asset.js("js/acquisitions-menu.js") | $raw %]
>+    [% INCLUDE 'columns_settings.inc' %]
>     <script>
>         dt_overwrite_html_sorting_localeCompare();
> 
>         $(document).ready(function() {
> 
>-            var oTable = $("#accounts").dataTable($.extend(true, {}, dataTablesDefaults, {
>+            var oTable = KohaTable("accounts", {
>                 "fnDrawCallback": function ( oSettings ) {
>                     if ( oSettings.aiDisplay.length == 0 )
>                     {
>@@ -237,12 +238,11 @@
>                     { "bVisible": false, "aTargets": [ 0, 1 ] },
>                     { "bSortable": false, "aTargets": ["_all"] }
>                 ],
>-                'dom': '<"top pager"ilpf>tr<"bottom pager"ip>',
>                 'bSort': true,
>                 'aaSortingFixed': [[ 1, 'asc' ]],
>                 'bPaginate': false,
>                 "bAutoWidth": false
>-            }));
>+            });
> 
>             $(oTable).treetable({
>                 expandable: true
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
>index 0fc2223de9..078e8b9e38 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
>@@ -607,6 +607,7 @@
>         </script>
>     [% ELSIF op == 'list' %]
>         [% INCLUDE 'datatables.inc' %]
>+        [% INCLUDE 'columns_settings.inc' %]
>         [% Asset.js("lib/jquery/plugins/treetable/jquery.treetable.js") | $raw %]
> 
>         <script>
>@@ -614,7 +615,7 @@
>             //
>             $(document).ready(function() {
>                 [% IF budgets %]
>-                    var oTable = $("#budgeth").dataTable($.extend(true, {}, dataTablesDefaults, {
>+                    var oTable = KohaTable("budgeth", {
>                         "fnDrawCallback": function ( oSettings ) {
>                             if ( oSettings.aiDisplay.length == 0 )
>                             {
>@@ -649,12 +650,11 @@
>                             { "bVisible": false, "aTargets": [ 0, 1 ] },
>                             { "bSortable": false, "aTargets": ["_all"] }
>                         ],
>-                        'dom': '<"top pager"ilpf>tr<"bottom pager"ip>',
>                         'bSort': true,
>                         'aaSortingFixed': [[ 1, 'asc' ]],
>                         'bPaginate': false,
>                         "bAutoWidth": false
>-                    }));
>+                    });
> 
>                     $(oTable).treetable({
>                         expandable: true
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 27646: 116435 | 116436 | 116442 | 116529 | 116863