From 601cbeab7611b1a47741673594224946daea850b Mon Sep 17 00:00:00 2001 From: Steffen Jost Date: Fri, 17 May 2019 13:40:39 +0200 Subject: [PATCH] Fixes #381 --- src/Handler/Utils.hs | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/Handler/Utils.hs b/src/Handler/Utils.hs index ed2334d5c..3f1bd2aae 100644 --- a/src/Handler/Utils.hs +++ b/src/Handler/Utils.hs @@ -54,8 +54,9 @@ serveOneFile query = do case results of [Entity _fileId File{fileTitle, fileContent}] | Just fileContent' <- fileContent -> do - whenM downloadFiles $ - addHeader "Content-Disposition" [st|attachment; filename="#{takeFileName fileTitle}"|] + ifM downloadFiles + (addHeader "Content-Disposition" [st|attachment; filename="#{takeFileName fileTitle}"|]) + (addHeader "Content-Disposition" [st|inline; filename="#{takeFileName fileTitle}"|]) return $ TypedContent (mimeLookup (pack fileTitle) <> "; charset=utf-8") (toContent fileContent') | otherwise -> sendResponseStatus noContent204 () [] -> notFound @@ -72,8 +73,9 @@ serveSomeFiles archiveName query = do [] -> notFound [Entity _fileId File{fileTitle, fileContent}] | Just fileContent' <- fileContent -> do - whenM downloadFiles $ - addHeader "Content-Disposition" [st|attachment; filename="#{takeFileName fileTitle}"|] + ifM downloadFiles + (addHeader "Content-Disposition" [st|attachment; filename="#{takeFileName fileTitle}"|]) + (addHeader "Content-Disposition" [st|inline; filename="#{takeFileName fileTitle}"|]) return $ TypedContent (mimeLookup (pack fileTitle) <> "; charset=utf-8") (toContent fileContent') | otherwise -> sendResponseStatus noContent204 () files -> do