From 938adb8a4eeeb78f757b696617266178e2417d93 Mon Sep 17 00:00:00 2001
From: Simon Michael <simon@joyful.com>
Date: Tue, 14 Jun 2011 21:26:56 +0000
Subject: [PATCH] web: add form uses currently focussed account as default from
 account

---
 hledger-web/.hledger/web/templates/addformpostingfields.hamlet | 2 +-
 hledger-web/Handlers.hs                                        | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/hledger-web/.hledger/web/templates/addformpostingfields.hamlet b/hledger-web/.hledger/web/templates/addformpostingfields.hamlet
index bd0b094ca..1ca346e3f 100644
--- a/hledger-web/.hledger/web/templates/addformpostingfields.hamlet
+++ b/hledger-web/.hledger/web/templates/addformpostingfields.hamlet
@@ -4,7 +4,7 @@
   <select id=#{acctvar} name=#{acctvar}
    <option
    $forall a <- acctnames
-    <option value=#{a}>#{a}
+    <option value=#{a} :shouldselect a:selected>#{a}
  ^{amtfield}
 <tr.helprow
  <td
diff --git a/hledger-web/Handlers.hs b/hledger-web/Handlers.hs
index 3172ab82f..1daf749cd 100644
--- a/hledger-web/Handlers.hs
+++ b/hledger-web/Handlers.hs
@@ -372,7 +372,7 @@ searchform VD{here=here,q=q} = $(Settings.hamletFile "searchform")
 
 -- | Add transaction form.
 addform :: ViewData -> Hamlet AppRoute
-addform vd = $(Settings.hamletFile "addform")
+addform vd@VD{qopts=qopts} = $(Settings.hamletFile "addform")
  where
   datehelp = "eg: 2010/7/20" :: String
   deschelp = "eg: supermarket (optional)" :: String
@@ -381,6 +381,7 @@ addform vd = $(Settings.hamletFile "addform")
   manyfiles = (length $ files $ j vd) > 1
   postingfields VD{j=j} n = $(Settings.hamletFile "addformpostingfields")
    where
+    shouldselect a = n == 2 && Just a == inAccount qopts
     numbered = (++ show n)
     acctvar = numbered "account"
     amtvar = numbered "amount"