From b74aa530f8448ed5c753ab7e5066ea6ffe3e2bee 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. Signed-off-by: Owen Leonard Signed-off-by: David Nind Signed-off-by: Lucas Gass --- 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 e5296a9ab41..e80fda26c5c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt @@ -579,10 +579,10 @@ [% END %] Place hold [% IF ( active && !closedate ) %] - Modify + Modify [% END %] [% IF !closedate || Koha.Preference('CancelOrdersInClosedBaskets') %] - Cancel order + Cancel order [% END %] @@ -1236,7 +1236,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 74557724486..56d2dbf7312 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt @@ -667,7 +667,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 392129f0fa6..ed860b8a23a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/restrictions.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/restrictions.tt @@ -194,10 +194,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 f399ce4ae9d..ec0bb6f0ba1 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/datatables.js +++ b/koha-tmpl/intranet-tmpl/prog/js/datatables.js @@ -741,10 +741,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 224a2a2ecda..e87f41184e3 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/restrictiontypes.js +++ b/koha-tmpl/intranet-tmpl/prog/js/restrictiontypes.js @@ -40,7 +40,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 fac83429694..fca006ef645 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/js/datatables.js +++ b/koha-tmpl/opac-tmpl/bootstrap/js/datatables.js @@ -111,10 +111,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