Merge branch 'master' into dev

This commit is contained in:
Jonas Winkler
2020-10-16 15:02:57 +02:00
39 changed files with 1939 additions and 398 deletions

View File

@@ -76,7 +76,10 @@ class FetchView(SessionOrBasicAuthMixin, DetailView):
content_type=content_types[self.object.file_type]
)
DISPOSITION = 'inline' if settings.INLINE_DOC else 'attachment'
DISPOSITION = (
'inline' if settings.INLINE_DOC or self.kwargs["kind"] == 'preview'
else 'attachment'
)
response["Content-Disposition"] = '{}; filename="{}"'.format(
DISPOSITION, self.object.file_name)