From d13c145b9732e35d84e2d9ce6c63f5e3cb51c075 Mon Sep 17 00:00:00 2001
From: Axel Angel <axel@james-b.ch>
Date: Wed, 18 Sep 2013 19:56:41 +0200
Subject: [PATCH 1/3] Add checkboxesField{,List} fields (based on
 multiSelectField{,List})

squashed:
    - Attrs are applied to checkboxes in checkBoxField
    - Fix checkboxesField{,List} attrs are applied to input instead of span
    - Fix checkboxesField{,List} attribute checked
---
 yesod-form/Yesod/Form/Fields.hs | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/yesod-form/Yesod/Form/Fields.hs b/yesod-form/Yesod/Form/Fields.hs
index 5c16d7eb..75f9cb97 100644
--- a/yesod-form/Yesod/Form/Fields.hs
+++ b/yesod-form/Yesod/Form/Fields.hs
@@ -388,6 +388,29 @@ radioFieldList :: (Eq a, RenderMessage site FormMessage, RenderMessage site msg)
                -> Field (HandlerT site IO) a
 radioFieldList = radioField . optionsPairs
 
+checkboxesFieldList :: (Eq a, RenderMessage site FormMessage, RenderMessage site msg) => [(msg, a)]
+                     -> Field (HandlerT site IO) [a]
+checkboxesFieldList = checkboxesField . optionsPairs
+
+checkboxesField :: (Eq a, RenderMessage site FormMessage)
+                 => HandlerT site IO (OptionList a)
+                 -> Field (HandlerT site IO) [a]
+checkboxesField ioptlist = (multiSelectField ioptlist)
+    { fieldView =
+        \theId name attrs val isReq -> do
+            opts <- fmap olOptions $ handlerToWidget ioptlist
+            let optselected (Left _) _ = False
+                optselected (Right vals) opt = (optionInternalValue opt) `elem` vals
+            let selOpts = map (id &&& (optselected val)) opts
+            [whamlet|
+                <span ##{theId}>
+                    $forall (opt, optsel) <- selOpts
+                        <label>
+                            <input type=checkbox name=#{name} value=#{optionExternalValue opt} *{attrs} :optsel:checked>
+                            #{optionDisplay opt}
+                |]
+    }
+
 radioField :: (Eq a, RenderMessage site FormMessage)
            => HandlerT site IO (OptionList a)
            -> Field (HandlerT site IO) a

From a3bef1bc2b4daa015ef400b0ef11206bdfaff1ac Mon Sep 17 00:00:00 2001
From: Axel Angel <axel@james-b.ch>
Date: Sun, 22 Sep 2013 15:01:09 +0200
Subject: [PATCH 2/3] Add missing exports for checkboxesField{,List}

---
 yesod-form/Yesod/Form/Fields.hs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/yesod-form/Yesod/Form/Fields.hs b/yesod-form/Yesod/Form/Fields.hs
index 75f9cb97..c8d0e368 100644
--- a/yesod-form/Yesod/Form/Fields.hs
+++ b/yesod-form/Yesod/Form/Fields.hs
@@ -36,6 +36,8 @@ module Yesod.Form.Fields
     , selectFieldList
     , radioField
     , radioFieldList
+    , checkboxesFieldList
+    , checkboxesField
     , multiSelectField
     , multiSelectFieldList
     , Option (..)

From 0dcc9e2b2978f85e33509f8365336f26aca13160 Mon Sep 17 00:00:00 2001
From: Axel Angel <axel@james-b.ch>
Date: Sun, 22 Sep 2013 15:08:21 +0200
Subject: [PATCH 3/3] Simplify in checkboxesField{,List}: no intermediate
 selOpts list

---
 yesod-form/Yesod/Form/Fields.hs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/yesod-form/Yesod/Form/Fields.hs b/yesod-form/Yesod/Form/Fields.hs
index c8d0e368..b8109dfb 100644
--- a/yesod-form/Yesod/Form/Fields.hs
+++ b/yesod-form/Yesod/Form/Fields.hs
@@ -403,12 +403,11 @@ checkboxesField ioptlist = (multiSelectField ioptlist)
             opts <- fmap olOptions $ handlerToWidget ioptlist
             let optselected (Left _) _ = False
                 optselected (Right vals) opt = (optionInternalValue opt) `elem` vals
-            let selOpts = map (id &&& (optselected val)) opts
             [whamlet|
                 <span ##{theId}>
-                    $forall (opt, optsel) <- selOpts
+                    $forall opt <- opts
                         <label>
-                            <input type=checkbox name=#{name} value=#{optionExternalValue opt} *{attrs} :optsel:checked>
+                            <input type=checkbox name=#{name} value=#{optionExternalValue opt} *{attrs} :optselected val opt:checked>
                             #{optionDisplay opt}
                 |]
     }