From 30a572c4d235382fc3c1544da354e8797775c100 Mon Sep 17 00:00:00 2001 From: Aleisha Amohia Date: Tue, 21 Apr 2020 07:22:28 +0000 Subject: [PATCH] Bug 13952: (follow-up) Removing XML options Signed-off-by: Mazen Khallaf Signed-off-by: Michal Denar Signed-off-by: Katrin Fischer Signed-off-by: Fridolin Somers --- admin/import_export_authtype.pl | 6 +----- .../intranet-tmpl/prog/en/modules/admin/authtypes.tt | 11 +++++------ koha-tmpl/intranet-tmpl/prog/js/authtype.js | 8 ++++---- 3 files changed, 10 insertions(+), 15 deletions(-) diff --git a/admin/import_export_authtype.pl b/admin/import_export_authtype.pl index a60f47283e..3553bfa0aa 100755 --- a/admin/import_export_authtype.pl +++ b/admin/import_export_authtype.pl @@ -61,10 +61,6 @@ if ($action eq 'export' && $input->request_method() eq 'GET') { binmode(STDOUT,':encoding(UTF-8)'); print $input->header(-type => 'application/vnd.ms-excel', -attachment => 'export_' . $authtypecode . '.csv'); print $strXml; - } elsif ($format eq 'excel') { - # Excel-xml file - print $input->header(-type => 'application/excel', -attachment => 'export_' . $authtypecode . '.xml'); - print $strXml; } else { # ODS file my $strODS = ''; @@ -81,7 +77,7 @@ if ($action eq 'export' && $input->request_method() eq 'GET') { } my $filename = $input->param($fieldname); # upload the input file - if ($filename && $filename =~ /\.(csv|ods|xml)$/i) { + if ($filename && $filename =~ /\.(csv|ods)$/i) { my $extension = $1; my $uploadFd = $input->upload($fieldname); if ($uploadFd && !$input->cgi_error) { diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt index eff2c33150..ca885d837f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt @@ -191,10 +191,10 @@ Authority types › Administration › Koha
  • MARC structure
  • Edit
  • [% IF authority_type.authtypecode %]
  • Delete
  • [% END %] - -
  • Export
  • - -
  • Import
  • + +
  • Export
  • + +
  • Import
  • @@ -211,7 +211,6 @@ Authority types › Administration › Koha

    -

    @@ -230,7 +229,7 @@ Authority types › Administration › Koha