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

web: fix compilation after recent lib changes

Browse Source
This commit is contained in:
Simon Michael 2014-07-03 09:37:02 -07:00
parent 16f8b78305
commit f30deee197
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hledger-web/Application.hs
View File

@ -77,7 +77,7 @@ makeFoundation conf = do
getApplicationDev :: IO (Int, Application) getApplicationDev :: IO (Int, Application)
getApplicationDev = do getApplicationDev = do
f <- journalFilePathFromOpts defcliopts f <- journalFilePathFromOpts defcliopts
j <- either error' id `fmap` readJournalFile Nothing Nothing f j <- either error' id `fmap` readJournalFile Nothing Nothing True f
defaultDevelApp loader (makeApplication defwebopts j) defaultDevelApp loader (makeApplication defwebopts j)
where where
loader = Yesod.Default.Config.loadConfig (configSettings Development) loader = Yesod.Default.Config.loadConfig (configSettings Development)

2
hledger-web/Handler/Post.hs
View File

@ -125,7 +125,7 @@ handleEdit = do
setMessage "No change" setMessage "No change"
redirect JournalR redirect JournalR
else do else do
jE <- liftIO $ readJournal Nothing Nothing (Just journalpath) tnew jE <- liftIO $ readJournal Nothing Nothing True (Just journalpath) tnew
either either
(\e -> do (\e -> do
setMessage $ toHtml e setMessage $ toHtml e

2
hledger-web/Hledger/Web/Main.hs
View File

@ -49,7 +49,7 @@ runWith opts
withJournalDo' :: WebOpts -> (WebOpts -> Journal -> IO ()) -> IO () withJournalDo' :: WebOpts -> (WebOpts -> Journal -> IO ()) -> IO ()
withJournalDo' opts cmd = do withJournalDo' opts cmd = do
journalFilePathFromOpts (cliopts_ opts) >>= readJournalFile Nothing Nothing >>= journalFilePathFromOpts (cliopts_ opts) >>= readJournalFile Nothing Nothing True >>=
either error' (cmd opts . journalApplyAliases (aliasesFromOpts $ cliopts_ opts)) either error' (cmd opts . journalApplyAliases (aliasesFromOpts $ cliopts_ opts))
-- | The web command. -- | The web command.