From 35d893ca9725b64f951926dec4c53266a2f788c7 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.
---
 koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

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 a882259..1d3c881 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.1.4