slaesvuo/hledger
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

web: avoid problematic redirect after submitting the add form

Browse Source
This commit is contained in:
Simon Michael 2012-01-03 12:43:30 +00:00
parent 41c1fa636a
commit 1b834afb20
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
hledger-web/Hledger/Web/Handlers.hs
View File

@ -436,20 +436,20 @@ mixedAmountAsHtml b = preEscapedString $ addclass $ intercalate "<br>" $ lines $
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
-- post handlers -- post handlers
postJournalR :: Handler RepPlain postJournalR :: Handler RepHtml
postJournalR = handlePost postJournalR = handlePost
postJournalEntriesR :: Handler RepPlain postJournalEntriesR :: Handler RepHtml
postJournalEntriesR = handlePost postJournalEntriesR = handlePost
postJournalEditR :: Handler RepPlain postJournalEditR :: Handler RepHtml
postJournalEditR = handlePost postJournalEditR = handlePost
postRegisterR :: Handler RepPlain postRegisterR :: Handler RepHtml
postRegisterR = handlePost postRegisterR = handlePost
-- | Handle a post from any of the edit forms. -- | Handle a post from any of the edit forms.
handlePost :: Handler RepPlain handlePost :: Handler RepHtml
handlePost = do handlePost = do
action <- lookupPostParam "action" action <- lookupPostParam "action"
case action of Just "add" -> handleAdd case action of Just "add" -> handleAdd
@ -458,7 +458,7 @@ handlePost = do
_ -> invalidArgs [pack "invalid action"] _ -> invalidArgs [pack "invalid action"]
-- | Handle a post from the transaction add form. -- | Handle a post from the transaction add form.
handleAdd :: Handler RepPlain handleAdd :: Handler RepHtml
handleAdd = do handleAdd = do
VD{..} <- getViewData VD{..} <- getViewData
-- get form input values. M means a Maybe value. -- get form input values. M means a Maybe value.
@ -509,7 +509,7 @@ handleAdd = do
$forall e<-errs $forall e<-errs
#{e}<br> #{e}<br>
|] |]
redirectParams RedirectTemporary RegisterR [("add","1")] getRegisterR
Right t -> do Right t -> do
let t' = txnTieKnot t -- XXX move into balanceTransaction let t' = txnTieKnot t -- XXX move into balanceTransaction
@ -517,13 +517,13 @@ handleAdd = do
appendToJournalFileOrStdout journalpath $ showTransaction t' appendToJournalFileOrStdout journalpath $ showTransaction t'
-- setMessage $ toHtml $ (printf "Added transaction:\n%s" (show t') :: String) -- setMessage $ toHtml $ (printf "Added transaction:\n%s" (show t') :: String)
setMessage [$shamlet|<span>Added transaction:<small><pre>#{chomp $ show t'}</pre></small>|] setMessage [$shamlet|<span>Added transaction:<small><pre>#{chomp $ show t'}</pre></small>|]
redirectParams RedirectTemporary RegisterR [("add","1")] getRegisterR
chomp :: String -> String chomp :: String -> String
chomp = reverse . dropWhile (`elem` "\r\n") . reverse chomp = reverse . dropWhile (`elem` "\r\n") . reverse
-- | Handle a post from the journal edit form. -- | Handle a post from the journal edit form.
handleEdit :: Handler RepPlain handleEdit :: Handler RepHtml
handleEdit = do handleEdit = do
VD{..} <- getViewData VD{..} <- getViewData
-- get form input values, or validation errors. -- get form input values, or validation errors.
@ -569,7 +569,7 @@ handleEdit = do
jE jE
-- | Handle a post from the journal import form. -- | Handle a post from the journal import form.
handleImport :: Handler RepPlain handleImport :: Handler RepHtml
handleImport = do handleImport = do
setMessage "can't handle file upload yet" setMessage "can't handle file upload yet"
redirect RedirectTemporary JournalR redirect RedirectTemporary JournalR