From 3e16277e5a507d9db03ab347428e512bdaa7f90a Mon Sep 17 00:00:00 2001
From: Nick Clemens <nick@bywatersolutions.com>
Date: Wed, 13 Apr 2022 19:42:06 +0000
Subject: [PATCH] Bug 18392: Add noExport of rows and don't export 'edit' row
Content-Type: text/plain; charset=utf-8
Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
---
.../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: '<i class="fa fa-lg fa-gear"></i> <span class="dt-button-text">' + _("Columns") + '</span>',
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 26db3f1a44..1323891ccf 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
@@ -380,7 +380,7 @@
[% END %]
[% END %]
[% END %]
- <tr id="edit_row">
+ <tr class="noExport" id="edit_row">
<td>2</td>
<td>
<select name="categorycode" id="categorycode">
--
2.20.1