From 8a0a270712cc8fa293ec257923509e9ccca2944e Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Sun, 5 Jul 2020 12:41:58 +0200
Subject: [PATCH] EHN: special handling of html files in shared resource.
The shared resource returns files of all media types as download
attachments except for HTML files, which should be opened by the browser
directly.
---
.../java/caosdb/server/resource/SharedFileResource.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/main/java/caosdb/server/resource/SharedFileResource.java b/src/main/java/caosdb/server/resource/SharedFileResource.java
index ffdce05b..71cf089d 100644
--- a/src/main/java/caosdb/server/resource/SharedFileResource.java
+++ b/src/main/java/caosdb/server/resource/SharedFileResource.java
@@ -71,7 +71,12 @@ public class SharedFileResource extends AbstractCaosDBServerResource {
final MediaType mt = MediaType.valueOf(FileUtils.getMimeType(file));
final FileRepresentation ret = new FileRepresentation(file, mt);
- ret.setDisposition(new Disposition(Disposition.TYPE_ATTACHMENT));
+
+ // HTML files should be opened in the browser.
+ // Any other media type than HTML is attached for download.
+ if (!MediaType.TEXT_HTML.includes(mt)) {
+ ret.setDisposition(new Disposition(Disposition.TYPE_ATTACHMENT));
+ }
return ret;
}
--
GitLab