From a24f9a61df989b2e0cfb042f800d65f170b5a7e8 Mon Sep 17 00:00:00 2001 From: Stephen Morgan Date: Mon, 13 Sep 2021 00:13:54 +1000 Subject: [PATCH] fix: web: Toggle showing zero elements properly even when called with --empty. (#1237) Calling with --empty now overrides any cookies determining whether zero accounts are hidden. --- hledger-web/Hledger/Web/Foundation.hs | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/hledger-web/Hledger/Web/Foundation.hs b/hledger-web/Hledger/Web/Foundation.hs index 262680015..5ace13192 100644 --- a/hledger-web/Hledger/Web/Foundation.hs +++ b/hledger-web/Hledger/Web/Foundation.hs @@ -113,16 +113,20 @@ instance Yesod App where VD {caps, j, m, opts, q, qopts} <- getViewData msg <- getMessage showSidebar <- shouldShowSidebar - hideEmptyAccts <- (== Just "1") . lookup "hideemptyaccts" . reqCookies <$> getRequest let rspec = reportspec_ (cliopts_ opts) ropts = _rsReportOpts rspec ropts' = (_rsReportOpts rspec) {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'} - 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 $ balanceReport rspec' j