From 480b4e33046ff37ec141e04b0245c40ab7e9f8b3 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Mon, 10 Feb 2014 11:24:10 +0200 Subject: [PATCH] Some fixes for mass input --- yesod-form/Yesod/Form/MassInput.hs | 4 ++-- yesod-form/Yesod/Form/Types.hs | 2 +- yesod-form/yesod-form.cabal | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/yesod-form/Yesod/Form/MassInput.hs b/yesod-form/Yesod/Form/MassInput.hs index 332eb660..a2b434d4 100644 --- a/yesod-form/Yesod/Form/MassInput.hs +++ b/yesod-form/Yesod/Form/MassInput.hs @@ -11,7 +11,7 @@ module Yesod.Form.MassInput import Yesod.Form.Types import Yesod.Form.Functions -import Yesod.Form.Fields (boolField) +import Yesod.Form.Fields (checkBoxField) import Yesod.Core import Control.Monad.Trans.RWS (get, put, ask) import Data.Maybe (fromMaybe) @@ -97,7 +97,7 @@ $newline never |] _ -> do - (_, xml2) <- aFormToForm $ areq boolField FieldSettings + (_, xml2) <- aFormToForm $ areq checkBoxField FieldSettings { fsLabel = SomeMessage MsgDelete , fsTooltip = Nothing , fsName = Just deleteName diff --git a/yesod-form/Yesod/Form/Types.hs b/yesod-form/Yesod/Form/Types.hs index 5dc79657..f5a75008 100644 --- a/yesod-form/Yesod/Form/Types.hs +++ b/yesod-form/Yesod/Form/Types.hs @@ -102,7 +102,7 @@ instance Monad m => Applicative (AForm m) where (AForm f) <*> (AForm g) = AForm $ \mr env ints -> do (a, b, ints', c) <- f mr env ints (x, y, ints'', z) <- g mr env ints' - return (a <*> x, b `mappend` y, ints'', c `mappend` z) + return (a <*> x, b . y, ints'', c `mappend` z) instance (Monad m, Monoid a) => Monoid (AForm m a) where mempty = pure mempty mappend a b = mappend <$> a <*> b diff --git a/yesod-form/yesod-form.cabal b/yesod-form/yesod-form.cabal index 1f6e0e1b..8665c89f 100644 --- a/yesod-form/yesod-form.cabal +++ b/yesod-form/yesod-form.cabal @@ -1,5 +1,5 @@ name: yesod-form -version: 1.3.5 +version: 1.3.5.1 license: MIT license-file: LICENSE author: Michael Snoyman