From 995e0bb96897c710864c2e7c75ba74e0a927fea2 Mon Sep 17 00:00:00 2001 From: Nick Clemens Date: Wed, 3 Jan 2018 14:07:17 +0000 Subject: [PATCH] Bug 19910: Use the delimiter syspref to name download link To test: 1 - Set delimiter syspref to anything but comma 2 - Download report results as comma separated text 3 - They actually follow the syspref 4 - Apply patch 5 - Download link should now match pref selection 6 - Change pref, note link changes 7 - Verify things still work as expected Signed-off-by: Owen Leonard Signed-off-by: Victor Grousset Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart --- .../intranet-tmpl/prog/en/includes/delimiter_text.inc | 8 ++++++++ .../intranet-tmpl/prog/en/includes/reports-toolbar.inc | 3 ++- 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/delimiter_text.inc diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/delimiter_text.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/delimiter_text.inc new file mode 100644 index 0000000000..e6b4aca0e5 --- /dev/null +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/delimiter_text.inc @@ -0,0 +1,8 @@ +[% SWITCH Koha.Preference('delimiter') %] + [% CASE '#' %]Pound (#) separated text (.csv) + [% CASE ',' %]Comma separated text (.csv) + [% CASE '/' %]Slash separated text (.csv) + [% CASE ';' %]Semicolon separated text (.csv) + [% CASE '\\' %]Backslash separated text (.csv) + [% CASE 'tabulation' %]Tab separated text (.csv) +[% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/reports-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/reports-toolbar.inc index 3f4208f77c..5f70852a2d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/reports-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/reports-toolbar.inc @@ -51,10 +51,11 @@ [%- FOREACH param IN sql_params %]&sql_params=[% param %][% END %] [%- END %] +
-- 2.39.5