From adbdbf002c0729cdb19983dda17a553efba5121c Mon Sep 17 00:00:00 2001 From: Henning Thielemann Date: Sat, 8 Jun 2019 10:22:51 +0200 Subject: [PATCH] web: avoid spaces before commas in register account links --- hledger-web/Hledger/Web/Handler/RegisterR.hs | 4 ++-- hledger-web/templates/register.hamlet | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/hledger-web/Hledger/Web/Handler/RegisterR.hs b/hledger-web/Hledger/Web/Handler/RegisterR.hs index aadb97a04..37ea1a369 100644 --- a/hledger-web/Hledger/Web/Handler/RegisterR.hs +++ b/hledger-web/Hledger/Web/Handler/RegisterR.hs @@ -34,8 +34,8 @@ getRegisterR = do acctQuery = fromMaybe Any (inAccountQuery qopts) acctlink acc = (RegisterR, [("q", accountQuery acc)]) otherTransAccounts = - zip ("" : repeat (","::T.Text)) . - preferReal . otherTransactionAccounts m acctQuery + addCommas . preferReal . otherTransactionAccounts m acctQuery + addCommas xs = zip xs $ tail $ (","<$xs) ++ [T.empty] r@(balancelabel,items) = accountTransactionsReport ropts j m acctQuery balancelabel' = if isJust (inAccount qopts) then balancelabel else "Total" defaultLayout $ do diff --git a/hledger-web/templates/register.hamlet b/hledger-web/templates/register.hamlet index 53b197622..3ddd0674f 100644 --- a/hledger-web/templates/register.hamlet +++ b/hledger-web/templates/register.hamlet @@ -26,10 +26,9 @@ #{textElideRight 30 (tdescription tacct)} - $forall (comma, Posting { paccount = acc }) <- otherTransAccounts torig - #{comma} + $forall (Posting { paccount = acc }, comma) <- otherTransAccounts torig - #{accountSummarisedName acc} + #{accountSummarisedName acc}#{comma} $if not split || not (isZeroMixedAmount amt) ^{mixedAmountAsHtml amt}