Attachment 81793 Details for Bug 20966 – Bug 20966: (follow-up) Add template variable filter; Fix table export

[patch] Bug 20966: (follow-up) Add template variable filter; Fix table export

Bug-20966-follow-up-Add-template-variable-filter-F.patch (text/plain), 2.32 KB, created by Katrin Fischer on 2018-11-01 11:50:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Katrin Fischer

Created: 2018-11-01 11:50:43 UTC

Size: 2.32 KB

patch

obsolete

>From 9d7b371bde75391d75f077ab1e713a26cff4c7dc Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Mon, 29 Oct 2018 13:40:20 +0000
>Subject: [PATCH] Bug 20966: (follow-up) Add template variable filter; Fix
> table export
>
>This patch makes to corrections:
>
>1. The "$raw" filter has been added to the column configuration
>2. The columns configuration now specifies which columns are exported in
>   Copy, Excel, etc. operations.
>
>To test, apply the patch and test the various table export buttons on a
>both a closed and open basket. Confirm that the 'Modify' and 'Cancel'
>columns are not exported.
>
>Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
>---
> admin/columns_settings.yml                              | 2 ++
> koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt | 5 +++--
> 2 files changed, 5 insertions(+), 2 deletions(-)
>
>diff --git a/admin/columns_settings.yml b/admin/columns_settings.yml
>index a372fc172c..299fe97539 100644
>--- a/admin/columns_settings.yml
>+++ b/admin/columns_settings.yml
>@@ -76,6 +76,8 @@ modules:
>           columnname: ecost_tax_included
>           is_hidden: 1
>         -
>+          columnname: replacement_price
>+        -
>           columnname: quantity
>         -
>           columnname: total_tax_excluded
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
>index a88225900d..1d3c881448 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
>@@ -805,7 +805,7 @@
>         [% END %]
>     [% END %]
>     <script>
>-        var columns_settings = [% ColumnsSettings.GetColumns( 'acqui', 'basket', 'orders', 'json' ) %];
>+        var columns_settings = [% ColumnsSettings.GetColumns( 'acqui', 'basket', 'orders', 'json' ) | $raw %];
>         $(document).ready(function() {
>             KohaTable("orders", {
>                 [% IF ( active ) %]
>@@ -815,7 +815,8 @@
>                     ],
>                 [% END %]
>                 "sPaginationType": "four_button",
>-                "autoWidth": false
>+                "autoWidth": false,
>+                "exportColumns": [0,1,2,3,4,5,6,7,8,9,10,11,12,13]
>             }, columns_settings);
> 
>             var cancelledorderst = $("#cancelledorderst").dataTable($.extend(true, {}, dataTablesDefaults, {
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 20966: 76179 | 77891 | 78310 | 80404 | 81498 | 81636 | 81792 | 81793 | 81910 | 81911 | 82134 | 82135