diff --git a/src/Handler/Admin/Avs.hs b/src/Handler/Admin/Avs.hs index 572d221ec..d455788ae 100644 --- a/src/Handler/Admin/Avs.hs +++ b/src/Handler/Admin/Avs.hs @@ -90,13 +90,6 @@ avsLicenceOptions = mkOptionList | l <- universeF ] - -jsonToWidget :: ToJSON a => a -> Widget -jsonToWidget x = - case jsonToHtml jsonReaderOptions htmlWriterOptions $ tshow $ toJSON x of - Left err -> msg2widget err - Right html -> toWgt html - getAdminAvsR, postAdminAvsR :: Handler Html getAdminAvsR = postAdminAvsR postAdminAvsR = do @@ -110,8 +103,8 @@ postAdminAvsR = do addMessage Info $ text2Html $ "Query: " <> tshow (toJSON fr) res <- avsQueryPerson fr case res of - Left err -> return . Just $ text2widget $ tshow err - Right jsn -> return . Just $ jsonToWidget jsn + Left err -> return . Just $ tshow err + Right jsn -> return . Just $ tshow jsn mbPerson <- formResultMaybe presult procFormPerson ((sresult, swidget), senctype) <- runFormPost $ makeAvsStatusForm Nothing @@ -119,8 +112,8 @@ postAdminAvsR = do addMessage Info $ text2Html $ "Query: " <> tshow (toJSON fr) res <- avsQueryStatus fr case res of - Left err -> return . Just $ text2widget $ tshow err - Right jsn -> return . Just $ jsonToWidget jsn + Left err -> return . Just $ tshow err + Right jsn -> return . Just $ tshow jsn mbStatus <- formResultMaybe sresult procFormStatus ((crUsrRes, crUsrWgt), crUsrEnctype) <- runFormPost $ identifyForm FIDAvsCreateUser $ \html -> diff --git a/src/Handler/Utils/Pandoc.hs b/src/Handler/Utils/Pandoc.hs index e49ce6019..5643dd30e 100644 --- a/src/Handler/Utils/Pandoc.hs +++ b/src/Handler/Utils/Pandoc.hs @@ -7,8 +7,6 @@ module Handler.Utils.Pandoc , renderMarkdownWith, parseMarkdownWith , htmlReaderOptions, markdownReaderOptions , markdownWriterOptions, htmlWriterOptions - , jsonToHtml - , jsonReaderOptions ) where import Import.NoFoundation @@ -105,16 +103,3 @@ markdownWriterOptions = def , P.writerTabStop = P.readerTabStop markdownReaderOptions } htmlWriterOptions = markdownWriterOptions - -jsonToHtml :: P.ReaderOptions -> P.WriterOptions -> Text -> Either (SomeMessage site) Html -jsonToHtml readerOptions writerOptions text = - bimap pandocError (preEscapedText . sanitizeBalance) . P.runPure $ - P.writeHtml5String writerOptions =<< P.readJSON readerOptions text - where - pandocError = SomeMessage . tshow - -jsonReaderOptions :: P.ReaderOptions -jsonReaderOptions = def - { P.readerExtensions = P.pandocExtensions - , P.readerTabStop = 2 - } diff --git a/templates/avs.hamlet b/templates/avs.hamlet index a755e172f..cd6cfa8e5 100644 --- a/templates/avs.hamlet +++ b/templates/avs.hamlet @@ -43,7 +43,7 @@ $# SPDX-License-Identifier: AGPL-3.0-or-later $maybe answer <- mbPerson

Unverarbeitete Antwort: # - ^{answer} + #{answer}

@@ -52,4 +52,4 @@ $# SPDX-License-Identifier: AGPL-3.0-or-later $maybe answer <- mbStatus

Unverarbeitete Antwort: # - ^{answer} \ No newline at end of file + #{answer} \ No newline at end of file