From f8ae453d15a315acbf9f6d6dc631bc6876c2fe40 Mon Sep 17 00:00:00 2001 From: Nick Clemens Date: Wed, 13 Apr 2022 19:42:06 +0000 Subject: [PATCH] Bug 18392: Add noExport of rows and don't export 'edit' row Signed-off-by: Lucas Gass Signed-off-by: Marcel de Rooy Signed-off-by: Kyle M Hall --- .../intranet-tmpl/prog/en/includes/columns_settings.inc | 9 ++++++++- .../intranet-tmpl/prog/en/modules/admin/smart-rules.tt | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/columns_settings.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/columns_settings.inc index 7cbfa976a0..42d4fb09bc 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/columns_settings.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/columns_settings.inc @@ -24,6 +24,7 @@ function KohaTable(id_selector, dt_parameters, columns_settings, add_filters) { }); var exportColumns = ":visible:not(.noExport)"; + var exportRows = ":visible:not(.noExport)"; if( dt_parameters.hasOwnProperty("exportColumns") ){ // A custom buttons configuration has been passed from the page exportColumns = dt_parameters["exportColumns"]; @@ -62,6 +63,7 @@ function KohaTable(id_selector, dt_parameters, columns_settings, add_filters) { text: _("CSV"), exportOptions: { columns: exportColumns, + rows: exportRows, format: export_format }, }, @@ -70,6 +72,7 @@ function KohaTable(id_selector, dt_parameters, columns_settings, add_filters) { text: _("Copy"), exportOptions: { columns: exportColumns, + rows: exportRows, format: export_format }, }, @@ -78,6 +81,7 @@ function KohaTable(id_selector, dt_parameters, columns_settings, add_filters) { text: _("Print"), exportOptions: { columns: exportColumns, + rows: exportRows, format: export_format }, } @@ -90,6 +94,7 @@ function KohaTable(id_selector, dt_parameters, columns_settings, add_filters) { text: _("Excel"), exportOptions: { columns: exportColumns, + rows: exportRows, format: export_format }, } @@ -101,6 +106,7 @@ function KohaTable(id_selector, dt_parameters, columns_settings, add_filters) { text: _("Excel"), exportOptions: { columns: exportColumns, + rows: exportRows, format: export_numeric }, } @@ -131,7 +137,8 @@ function KohaTable(id_selector, dt_parameters, columns_settings, add_filters) { titleAttr: _("Columns settings"), text: ' ' + _("Columns") + '', exportOptions: { - columns: exportColumns + columns: exportColumns, + rows: exportRows, } } ); diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt index c2762731a2..7c364a8a45 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt @@ -352,7 +352,7 @@ [% END %] [% END %] [% END %] - + 2