From d801eb1ab74b9e772077f3886856835eb1969462 Mon Sep 17 00:00:00 2001
From: Simon Michael <simon@joyful.com>
Date: Mon, 23 Feb 2015 23:55:28 +0000
Subject: [PATCH] web: fix error message being a bit too persistent

visiting ?add=1 afresh was still showing the previous visit's error
---
 hledger-web/Foundation.hs                           | 1 +
 hledger-web/templates/default-layout-wrapper.hamlet | 2 +-
 hledger-web/templates/default-layout.hamlet         | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/hledger-web/Foundation.hs b/hledger-web/Foundation.hs
index 3ea63d38d..7b12915b9 100644
--- a/hledger-web/Foundation.hs
+++ b/hledger-web/Foundation.hs
@@ -105,6 +105,7 @@ instance Yesod App where
 
     defaultLayout widget = do
         master <- getYesod
+        lastmsg <- getMessage
         vd@VD{..} <- getViewData
 
         -- We break up the default layout into two components:
diff --git a/hledger-web/templates/default-layout-wrapper.hamlet b/hledger-web/templates/default-layout-wrapper.hamlet
index d168a9da9..b5ac01345 100644
--- a/hledger-web/templates/default-layout-wrapper.hamlet
+++ b/hledger-web/templates/default-layout-wrapper.hamlet
@@ -100,7 +100,7 @@ $newline never
                 <button type="button" .close data-dismiss="modal" aria-hidden="true">&times;
                 <h3 .modal-title #addLabel>Add a transaction
               <div .modal-body>
-                $maybe m <- msg
+                $maybe m <- lastmsg
                   $if isPrefixOf "Errors" (renderHtml m)
                     <div #message>#{m}
                 ^{addform staticRootUrl vd}
diff --git a/hledger-web/templates/default-layout.hamlet b/hledger-web/templates/default-layout.hamlet
index 846a59053..14183ea67 100644
--- a/hledger-web/templates/default-layout.hamlet
+++ b/hledger-web/templates/default-layout.hamlet
@@ -1,4 +1,4 @@
-$maybe m <- msg
+$maybe m <- lastmsg
   $if not $ isPrefixOf "Errors" (renderHtml m)
     <div #message>#{m}
 ^{widget}