From 34f8ab6f4040aeaee2cf674a550c052bc3c1a9b8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marc=20V=C3=A9ron?= Date: Sat, 28 May 2016 09:44:40 +0200 Subject: [PATCH] Bug 16589 - Quote of the day: Fix upload with csv files associated to LibreOffice Calc MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit To reproduce: - Install LibreOffice and make sure that csv files are associated to Calc (Note: tested with Firefox 46.0.1 on Windows 8) - Go to Home > Tools > Quote editor > Quote uploader - Try to upload a valid CSV (e.g. Example from Bug 15684) Result: File can not be uploaded (Incorrect filetype: application/vnd.sun.xml.calc) To test: - Apply patch - Try to upload again Expected result: Quotes are imported. Signed-off-by: Frédéric Demians Can't reproduce on a Mac but get it fails on a Windows Box: fixed with this patch. Signed-off-by: Jonathan Druart Can't recreate on debian but the fix looks safe. Signed-off-by: Kyle M Hall (cherry picked from commit 8631ebaf9f634976b076958707af355baf78cc2f) Signed-off-by: Frédéric Demians --- koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes-upload.tt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes-upload.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes-upload.tt index f98d6dd6d6..cf34371e33 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes-upload.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes-upload.tt @@ -238,7 +238,7 @@ var fileType = evt.target.files[0].type || 'unknown'; var fileSizeInK = Math.round(evt.target.files[0].size/1024); - if (!fileType.match(/comma-separated-values|csv|excel/i)) { + if (!fileType.match(/comma-separated-values|csv|excel|calc/i)) { alert(_("Uploads limited to csv. Incorrect filetype: %s").format(fileType)); parent.location='quotes-upload.pl'; return; -- 2.39.5