From 408bee5d8f12464a50307f5039a2bdacbe2b3d3f Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Tue, 28 Jan 2025 12:12:26 +0100 Subject: [PATCH] Bug 38472: Remove kohaTable's exportColumns option We hardcode the id of the columns to export, we should use .noExport instead on the columns we do not want to export. Test plan: Confirm that the columns exported on the acqui/basket, admin/categories and admin/restrictions pages are the same with and without this patch. --- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt | 5 ++--- .../intranet-tmpl/prog/en/modules/admin/categories.tt | 2 +- .../intranet-tmpl/prog/en/modules/admin/restrictions.tt | 8 ++++---- koha-tmpl/intranet-tmpl/prog/js/categories.js | 1 - koha-tmpl/intranet-tmpl/prog/js/datatables.js | 4 ---- koha-tmpl/intranet-tmpl/prog/js/restrictiontypes.js | 1 - koha-tmpl/opac-tmpl/bootstrap/js/datatables.js | 4 ---- 7 files changed, 7 insertions(+), 18 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 7241614b852..676eb0f294e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt @@ -525,10 +525,10 @@ [% END %] Place hold [% IF ( active && !closedate ) %] - Modify + Modify [% END %] [% IF !closedate || Koha.Preference('CancelOrdersInClosedBaskets') %] - Cancel order + Cancel order [% END %] @@ -1164,7 +1164,6 @@ $("#orders").kohaTable({ pagingType: "full", autoWidth: false, - exportColumns: [0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18[% IF (Koha.Preference('EDIFACT') && ediaccount) %],19[% END %]], }, table_settings); $("#cancelledorderst").kohaTable({ diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt index 0eb945497cf..5134e3991d4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt @@ -647,7 +647,7 @@ Checkout charge limit Guarantees checkout charge limit Guarantors with guarantees checkout charge limit - Actions + Actions diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/restrictions.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/restrictions.tt index 03f40db3397..f92b48031c6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/restrictions.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/restrictions.tt @@ -195,10 +195,10 @@ Code Label - Default - Lift after payment? - Fee limit - Actions + Default + Lift after payment? + Fee limit + Actions diff --git a/koha-tmpl/intranet-tmpl/prog/js/categories.js b/koha-tmpl/intranet-tmpl/prog/js/categories.js index be4fc5923e1..d412f10c157 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/categories.js +++ b/koha-tmpl/intranet-tmpl/prog/js/categories.js @@ -47,7 +47,6 @@ $(document).ready(function () { }, ], pagingType: "full", - exportColumns: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12], bKohaColumnsUseNames: true, }, table_settings diff --git a/koha-tmpl/intranet-tmpl/prog/js/datatables.js b/koha-tmpl/intranet-tmpl/prog/js/datatables.js index a49e1d30f2d..9313f9135c0 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/datatables.js +++ b/koha-tmpl/intranet-tmpl/prog/js/datatables.js @@ -603,10 +603,6 @@ function _dt_buttons(params){ let table_settings = params.table_settings; var exportColumns = ":visible:not(.noExport)"; - if( settings.hasOwnProperty("exportColumns") ){ - // A custom buttons configuration has been passed from the page - exportColumns = settings["exportColumns"]; - } const export_format_spreadsheet = { body: function ( data, row, column, node ) { diff --git a/koha-tmpl/intranet-tmpl/prog/js/restrictiontypes.js b/koha-tmpl/intranet-tmpl/prog/js/restrictiontypes.js index 9440b5dcb68..674e192a153 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/restrictiontypes.js +++ b/koha-tmpl/intranet-tmpl/prog/js/restrictiontypes.js @@ -30,7 +30,6 @@ $(document).ready(function() { ], order: [[1, "asc"]], pagingType: "full", - exportColumns: [0, 1], }); $("#restriction_form").validate({ diff --git a/koha-tmpl/opac-tmpl/bootstrap/js/datatables.js b/koha-tmpl/opac-tmpl/bootstrap/js/datatables.js index 0e8db747564..9a3e090cb3a 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/js/datatables.js +++ b/koha-tmpl/opac-tmpl/bootstrap/js/datatables.js @@ -124,10 +124,6 @@ function _dt_buttons(params){ let table_settings = params.table_settings; var exportColumns = ":visible:not(.noExport)"; - if( settings.hasOwnProperty("exportColumns") ){ - // A custom buttons configuration has been passed from the page - exportColumns = settings["exportColumns"]; - } var export_format = { body: function ( data, row, column, node ) { -- 2.34.1