From 3a92a1c1f2b254a75419e655fc9d889fd4de07c9 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Sun, 11 Apr 2021 20:47:05 +0200 Subject: [PATCH] chore: inline error message into help requests --- src/Jobs/Handler/HelpRequest.hs | 10 ---------- src/Utils.hs | 3 +++ templates/mail/support.hamlet | 11 +++++++---- 3 files changed, 10 insertions(+), 14 deletions(-) diff --git a/src/Jobs/Handler/HelpRequest.hs b/src/Jobs/Handler/HelpRequest.hs index 42ad88d0f..8fe7af509 100644 --- a/src/Jobs/Handler/HelpRequest.hs +++ b/src/Jobs/Handler/HelpRequest.hs @@ -34,14 +34,4 @@ dispatchJobHelpRequest jSender jRequestTime jHelpSubject jHelpRequest jReferer j setDate jRequestTime rtime <- formatTimeMail SelFormatDateTime jRequestTime - errPartName <- for jError $ \_ -> do - objId <- setMailObjectIdRandom - mr <- getMailMessageRender - return . mr $ MsgHelpErrorYamlFilename objId - addHtmlMarkdownAlternatives ($(ihamletFile "templates/mail/support.hamlet") :: HtmlUrlI18n UniWorXMessage (Route UniWorX)) - - whenIsJust ((,) <$> jError <*> errPartName) $ \(err, partName) -> addPart' $ do - toMailPart $ toYAML err - _partDisposition .= InlineDisposition partName - diff --git a/src/Utils.hs b/src/Utils.hs index 96e4388f6..ed364adc1 100644 --- a/src/Utils.hs +++ b/src/Utils.hs @@ -217,6 +217,9 @@ instance ToTypedContent YamlValue where instance HasContentType YamlValue where getContentType _ = "text/vnd.yaml" +instance ToMarkup YamlValue where + toMarkup = toMarkup . decodeUtf8 . Yaml.encode + toYAML :: ToJSON a => a -> YamlValue toYAML = YamlValue . toJSON diff --git a/templates/mail/support.hamlet b/templates/mail/support.hamlet index f85790925..fc71f1841 100644 --- a/templates/mail/support.hamlet +++ b/templates/mail/support.hamlet @@ -7,6 +7,10 @@ $newline never .url { font-family: monospace; } + .error { + font-family: monospace; + white-space: pre-wrap; + }
@@ -42,11 +46,10 @@ $newline never
#{referer} - $maybe errName <- errPartName + $maybe err <- jError
Fehlermeldung -
- - #{errName} +
+ #{toYAML err} $maybe request <- jHelpRequest
#{request}