s434730/RandomSec
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

correct excel mime types (#2596)

Browse Source 
* correct excel mime types

* address PR issue

* remove use of wildcard
This commit is contained in:
PJ Fanning 2020-04-26 14:36:37 +02:00 committed by GitHub
parent 88f7fb2852
commit 1a0e187561
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
main/src/com/google/refine/exporters/XlsExporter.java
View File

@ -65,7 +65,7 @@ public class XlsExporter implements StreamExporter {
@Override @Override
public String getContentType() { public String getContentType() {
return xml ? "application/xlsx" : "application/xls"; return xml ? "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet" : "application/vnd.ms-excel";
} }
@Override @Override

5
main/tests/server/src/com/google/refine/exporters/XlsExporterTests.java
View File

@ -106,6 +106,11 @@ public class XlsExporterTests extends RefineTest {
options = null; options = null;
} }
@Test
public void getContentType(){
Assert.assertEquals(SUT.getContentType(), "application/vnd.ms-excel");
}
@Test @Test
public void exportSimpleXls(){ public void exportSimpleXls(){
CreateGrid(2, 2); CreateGrid(2, 2);

5
main/tests/server/src/com/google/refine/exporters/XlsxExporterTests.java
View File

@ -110,6 +110,11 @@ public class XlsxExporterTests extends RefineTest {
options = null; options = null;
} }
@Test
public void getContentType(){
Assert.assertEquals(SUT.getContentType(), "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
}
@Test @Test
public void exportSimpleXlsx(){ public void exportSimpleXlsx(){
CreateGrid(2, 2); CreateGrid(2, 2);

2
main/webapp/modules/core/MOD-INF/controller.js
View File

@ -291,6 +291,8 @@ function registerImporting() {
IM.registerMimeType("application/x-excel", "binary/text/xml/xls/xlsx"); IM.registerMimeType("application/x-excel", "binary/text/xml/xls/xlsx");
IM.registerMimeType("application/xls", "binary/text/xml/xls/xlsx"); IM.registerMimeType("application/xls", "binary/text/xml/xls/xlsx");
IM.registerMimeType("application/x-xls", "binary/text/xml/xls/xlsx"); IM.registerMimeType("application/x-xls", "binary/text/xml/xls/xlsx");
IM.registerMimeType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", "binary/text/xml/xls/xlsx");
IM.registerMimeType("application/vnd.openxmlformats-officedocument.spreadsheetml.template", "binary/text/xml/xls/xlsx");
IM.registerMimeType("application/vnd.oasis.opendocument.spreadsheet","text/xml/ods"); IM.registerMimeType("application/vnd.oasis.opendocument.spreadsheet","text/xml/ods");