From c6ebf0e5cf3acd2d4d06a798ad8af7c173dab382 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Thu, 24 Oct 2019 18:21:04 +0200 Subject: [PATCH] Bug 23398: Disable the XML import/export format for biblio framework It gives incomplete results and not sure it ever worked. To prevent data loss it is better to remove this option. Note that the code in C4/ImportExportFramework.pm is too complex to attach with this patch to deletion of the code related to the XML import/export. Safer to keep it for a separate bug report. Test plan: Import/export biblio frameworks and confirm that there is no more reference to the xml format. Signed-off-by: Martin Renvoize Signed-off-by: Marcel de Rooy Signed-off-by: Martin Renvoize (cherry picked from commit ed45a4f333fb9f6569d150410ef99d8ffe13f54c) Signed-off-by: Fridolin Somers --- admin/import_export_framework.pl | 6 +----- .../prog/en/modules/admin/biblio_framework.tt | 16 +++++++--------- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/admin/import_export_framework.pl b/admin/import_export_framework.pl index ad95804dba..a1a05f9eae 100755 --- a/admin/import_export_framework.pl +++ b/admin/import_export_framework.pl @@ -62,10 +62,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_' . $framework_name . '.csv'); print $strXml; - } elsif ($format eq 'excel') { - # Excel-xml file - print $input->header(-type => 'application/excel', -attachment => 'export_' . $framework_name . '.xml'); - print $strXml; } else { # ODS file my $strODS = ''; @@ -79,7 +75,7 @@ if ($action eq 'export' && $input->request_method() eq 'GET') { my $fieldname = 'file_import_' . $framework_name; 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/biblio_framework.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt index c94398cdde..59ae3a6d07 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt @@ -141,9 +141,9 @@ @@ -177,7 +176,7 @@