fraport/fradrive-old
Archived
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: inline error message into help requests

Browse Source
This commit is contained in:
Gregor Kleen 2021-04-11 20:47:05 +02:00
parent 7ad07e7ffa
commit 3a92a1c1f2
3 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Jobs/Handler/HelpRequest.hs
View File

@ -34,14 +34,4 @@ dispatchJobHelpRequest jSender jRequestTime jHelpSubject jHelpRequest jReferer j
setDate jRequestTime setDate jRequestTime
rtime <- formatTimeMail SelFormatDateTime 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)) addHtmlMarkdownAlternatives ($(ihamletFile "templates/mail/support.hamlet") :: HtmlUrlI18n UniWorXMessage (Route UniWorX))
whenIsJust ((,) <$> jError <*> errPartName) $ \(err, partName) -> addPart' $ do
toMailPart $ toYAML err
_partDisposition .= InlineDisposition partName

3
src/Utils.hs
View File

@ -217,6 +217,9 @@ instance ToTypedContent YamlValue where
instance HasContentType YamlValue where instance HasContentType YamlValue where
getContentType _ = "text/vnd.yaml" getContentType _ = "text/vnd.yaml"
instance ToMarkup YamlValue where
toMarkup = toMarkup . decodeUtf8 . Yaml.encode
toYAML :: ToJSON a => a -> YamlValue toYAML :: ToJSON a => a -> YamlValue
toYAML = YamlValue . toJSON toYAML = YamlValue . toJSON

11
templates/mail/support.hamlet
View File

@ -7,6 +7,10 @@ $newline never
.url { .url {
font-family: monospace; font-family: monospace;
} }
.error {
font-family: monospace;
white-space: pre-wrap;
}
<body> <body>
<section> <section>
<dl> <dl>
@ -42,11 +46,10 @@ $newline never
<dd> <dd>
<a href=#{referer} .url> <a href=#{referer} .url>
#{referer} #{referer}
$maybe errName <- errPartName $maybe err <- jError
<dt>Fehlermeldung <dt>Fehlermeldung
<dd> <dd .error>
<a href="cid:#{errName}"> #{toYAML err}
#{errName}
$maybe request <- jHelpRequest $maybe request <- jHelpRequest
<section> <section>
#{request} #{request}