From a35161cf6e72d83ba21f1790944bf8c7f4fdbfaf Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Mon, 12 Nov 2012 17:51:41 +0200 Subject: [PATCH] Haddock fixes --- yesod-form/Yesod/Form/Functions.hs | 2 +- yesod-form/Yesod/Form/Types.hs | 16 ++++++++++------ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/yesod-form/Yesod/Form/Functions.hs b/yesod-form/Yesod/Form/Functions.hs index bce62479..a8327fad 100644 --- a/yesod-form/Yesod/Form/Functions.hs +++ b/yesod-form/Yesod/Form/Functions.hs @@ -202,7 +202,7 @@ $newline never FormFailure [renderMessage m langs MsgCsrfWarning] _ -> res where (Just [t1]) === (Just t2) = TE.encodeUtf8 t1 `constTimeEq` TE.encodeUtf8 t2 - Nothing === Nothing = True -- ^ It's important to use constTimeEq + Nothing === Nothing = True -- It's important to use constTimeEq _ === _ = False -- in order to avoid timing attacks. return ((res', xml), enctype) diff --git a/yesod-form/Yesod/Form/Types.hs b/yesod-form/Yesod/Form/Types.hs index 2f591e27..4a481313 100644 --- a/yesod-form/Yesod/Form/Types.hs +++ b/yesod-form/Yesod/Form/Types.hs @@ -18,6 +18,7 @@ module Yesod.Form.Types , Field (..) , FieldSettings (..) , FieldView (..) + , FieldViewFunc ) where import Control.Monad.Trans.RWS (RWST) @@ -123,14 +124,17 @@ data FieldView sub master = FieldView , fvRequired :: Bool } +type FieldViewFunc sub master a + = Text -- ^ ID + -> Text -- ^ Name + -> [(Text, Text)] -- ^ Attributes + -> Either Text a -- ^ Either (invalid text) or (legitimate result) + -> Bool -- ^ Required? + -> GWidget sub master () + data Field sub master a = Field { fieldParse :: [Text] -> GHandler sub master (Either (SomeMessage master) (Maybe a)) - , fieldView :: Text -- ^ ID - -> Text -- ^ Name - -> [(Text, Text)] -- ^ Attributes - -> Either Text a -- ^ Either (invalid text) or (legitimate result) - -> Bool -- ^ Required? - -> GWidget sub master () + , fieldView :: FieldViewFunc sub master a } data FormMessage = MsgInvalidInteger Text