Revert "chore(avs): avs testpage shows JSON pandoc formatted"
This reverts commit 1216bc0f2f.
Pandoc JSON Parser failes on tshow . ToJSON
This commit is contained in:
parent
1216bc0f2f
commit
3596809192
@ -90,13 +90,6 @@ avsLicenceOptions = mkOptionList
|
|||||||
| l <- universeF
|
| 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 :: Handler Html
|
||||||
getAdminAvsR = postAdminAvsR
|
getAdminAvsR = postAdminAvsR
|
||||||
postAdminAvsR = do
|
postAdminAvsR = do
|
||||||
@ -110,8 +103,8 @@ postAdminAvsR = do
|
|||||||
addMessage Info $ text2Html $ "Query: " <> tshow (toJSON fr)
|
addMessage Info $ text2Html $ "Query: " <> tshow (toJSON fr)
|
||||||
res <- avsQueryPerson fr
|
res <- avsQueryPerson fr
|
||||||
case res of
|
case res of
|
||||||
Left err -> return . Just $ text2widget $ tshow err
|
Left err -> return . Just $ tshow err
|
||||||
Right jsn -> return . Just $ jsonToWidget jsn
|
Right jsn -> return . Just $ tshow jsn
|
||||||
mbPerson <- formResultMaybe presult procFormPerson
|
mbPerson <- formResultMaybe presult procFormPerson
|
||||||
|
|
||||||
((sresult, swidget), senctype) <- runFormPost $ makeAvsStatusForm Nothing
|
((sresult, swidget), senctype) <- runFormPost $ makeAvsStatusForm Nothing
|
||||||
@ -119,8 +112,8 @@ postAdminAvsR = do
|
|||||||
addMessage Info $ text2Html $ "Query: " <> tshow (toJSON fr)
|
addMessage Info $ text2Html $ "Query: " <> tshow (toJSON fr)
|
||||||
res <- avsQueryStatus fr
|
res <- avsQueryStatus fr
|
||||||
case res of
|
case res of
|
||||||
Left err -> return . Just $ text2widget $ tshow err
|
Left err -> return . Just $ tshow err
|
||||||
Right jsn -> return . Just $ jsonToWidget jsn
|
Right jsn -> return . Just $ tshow jsn
|
||||||
mbStatus <- formResultMaybe sresult procFormStatus
|
mbStatus <- formResultMaybe sresult procFormStatus
|
||||||
|
|
||||||
((crUsrRes, crUsrWgt), crUsrEnctype) <- runFormPost $ identifyForm FIDAvsCreateUser $ \html ->
|
((crUsrRes, crUsrWgt), crUsrEnctype) <- runFormPost $ identifyForm FIDAvsCreateUser $ \html ->
|
||||||
|
|||||||
@ -7,8 +7,6 @@ module Handler.Utils.Pandoc
|
|||||||
, renderMarkdownWith, parseMarkdownWith
|
, renderMarkdownWith, parseMarkdownWith
|
||||||
, htmlReaderOptions, markdownReaderOptions
|
, htmlReaderOptions, markdownReaderOptions
|
||||||
, markdownWriterOptions, htmlWriterOptions
|
, markdownWriterOptions, htmlWriterOptions
|
||||||
, jsonToHtml
|
|
||||||
, jsonReaderOptions
|
|
||||||
) where
|
) where
|
||||||
|
|
||||||
import Import.NoFoundation
|
import Import.NoFoundation
|
||||||
@ -105,16 +103,3 @@ markdownWriterOptions = def
|
|||||||
, P.writerTabStop = P.readerTabStop markdownReaderOptions
|
, P.writerTabStop = P.readerTabStop markdownReaderOptions
|
||||||
}
|
}
|
||||||
htmlWriterOptions = markdownWriterOptions
|
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
|
|
||||||
}
|
|
||||||
|
|||||||
@ -43,7 +43,7 @@ $# SPDX-License-Identifier: AGPL-3.0-or-later
|
|||||||
$maybe answer <- mbPerson
|
$maybe answer <- mbPerson
|
||||||
<p>
|
<p>
|
||||||
Unverarbeitete Antwort: #
|
Unverarbeitete Antwort: #
|
||||||
^{answer}
|
#{answer}
|
||||||
|
|
||||||
<section>
|
<section>
|
||||||
<p>
|
<p>
|
||||||
@ -52,4 +52,4 @@ $# SPDX-License-Identifier: AGPL-3.0-or-later
|
|||||||
$maybe answer <- mbStatus
|
$maybe answer <- mbStatus
|
||||||
<p>
|
<p>
|
||||||
Unverarbeitete Antwort: #
|
Unverarbeitete Antwort: #
|
||||||
^{answer}
|
#{answer}
|
||||||
Reference in New Issue
Block a user