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

fix: web: Toggle showing zero elements properly even when called with

Browse Source 
--empty. (#1237)

Calling with --empty now overrides any cookies determining whether
zero accounts are hidden.
This commit is contained in:
Stephen Morgan 2021-09-13 00:13:54 +10:00 committed by Simon Michael
parent 9f5b652b4e
commit a24f9a61df
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hledger-web/Hledger/Web/Foundation.hs
View File

@ -113,16 +113,20 @@ instance Yesod App where
VD {caps, j, m, opts, q, qopts} <- getViewData VD {caps, j, m, opts, q, qopts} <- getViewData
msg <- getMessage msg <- getMessage
showSidebar <- shouldShowSidebar showSidebar <- shouldShowSidebar
hideEmptyAccts <- (== Just "1") . lookup "hideemptyaccts" . reqCookies <$> getRequest
let rspec = reportspec_ (cliopts_ opts) let rspec = reportspec_ (cliopts_ opts)
ropts = _rsReportOpts rspec ropts = _rsReportOpts rspec
ropts' = (_rsReportOpts rspec) ropts' = (_rsReportOpts rspec)
{accountlistmode_ = ALTree -- force tree mode for sidebar {accountlistmode_ = ALTree -- force tree mode for sidebar
,empty_ = not (empty_ ropts) -- show zero items by default ,empty_ = True -- show zero items by default
} }
rspec' = rspec{_rsQuery=m,_rsReportOpts=ropts'} rspec' = rspec{_rsQuery=m,_rsReportOpts=ropts'}
accounts =
hideEmptyAccts <- if empty_ ropts
then return True
else (== Just "1") . lookup "hideemptyaccts" . reqCookies <$> getRequest
let accounts =
balanceReportAsHtml (JournalR, RegisterR) here hideEmptyAccts j q qopts $ balanceReportAsHtml (JournalR, RegisterR) here hideEmptyAccts j q qopts $
balanceReport rspec' j balanceReport rspec' j