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

web: show a proper not found page on 404

Browse Source
This commit is contained in:
Simon Michael 2016-05-06 19:30:23 -07:00
parent aac67b3d4d
commit 1b674cbb44
1 changed files with 45 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hledger-web/Foundation.hs
View File

@ -235,17 +235,19 @@ viewdataWithDateAndParams d q a p =
-- | Gather data used by handlers and templates in the current request. -- | Gather data used by handlers and templates in the current request.
getViewData :: Handler ViewData getViewData :: Handler ViewData
getViewData = do getViewData = do
mhere <- getCurrentRoute
case mhere of
Nothing -> return nullviewdata
Just here -> do
app <- getYesod app <- getYesod
let opts@WebOpts{cliopts_=copts@CliOpts{reportopts_=ropts}} = appOpts app let opts@WebOpts{cliopts_=copts@CliOpts{reportopts_=ropts}} = appOpts app
today <- liftIO getCurrentDay today <- liftIO getCurrentDay
(j, merr) <- getCurrentJournal app copts{reportopts_=ropts{no_elide_=True}} today (j, merr) <- getCurrentJournal app copts{reportopts_=ropts{no_elide_=True}} today
lastmsg <- getLastMessage lastmsg <- getLastMessage
let msg = maybe lastmsg (Just . toHtml) merr let msg = maybe lastmsg (Just . toHtml) merr
Just here <- getCurrentRoute
q <- getParameterOrNull "q" q <- getParameterOrNull "q"
a <- getParameterOrNull "a" a <- getParameterOrNull "a"
p <- getParameterOrNull "p" p <- getParameterOrNull "p"
-- sidebar visibility: show it, unless there is a showsidebar cookie -- sidebar visibility: show it, unless there is a showsidebar cookie
-- set to "0", or a ?sidebar=0 query parameter. -- set to "0", or a ?sidebar=0 query parameter.
msidebarparam <- lookupGetParam "sidebar" msidebarparam <- lookupGetParam "sidebar"