From 6119f8507e7ba28d0b93ed89abf9ec5036c8f41b Mon Sep 17 00:00:00 2001 From: Matt Brown Date: Thu, 14 Oct 2010 16:54:01 -0700 Subject: [PATCH] added fiRequired :: Bool to FieldInfo --- Yesod/Form/Core.hs | 3 +++ Yesod/Form/Fields.hs | 3 +++ 2 files changed, 6 insertions(+) diff --git a/Yesod/Form/Core.hs b/Yesod/Form/Core.hs index 39f9f97b..50227baa 100644 --- a/Yesod/Form/Core.hs +++ b/Yesod/Form/Core.hs @@ -160,6 +160,7 @@ requiredFieldHelper (FieldProfile parse render mkWidget) ffs orig = GForm $ do , fiErrors = case res of FormFailure [x] -> Just $ string x _ -> Nothing + , fiRequired = True } return (res, [fi], UrlEncoded) @@ -191,6 +192,7 @@ optionalFieldHelper (FieldProfile parse render mkWidget) ffs orig' = GForm $ do , fiErrors = case res of FormFailure x -> Just $ string $ unlines x _ -> Nothing + , fiRequired = False } return (res, [fi], UrlEncoded) @@ -212,6 +214,7 @@ data FieldInfo sub y = FieldInfo , fiIdent :: String , fiInput :: GWidget sub y () , fiErrors :: Maybe Html + , fiRequired :: Bool } data FormFieldSettings = FormFieldSettings diff --git a/Yesod/Form/Fields.hs b/Yesod/Form/Fields.hs index 4fd4b3db..00efc901 100644 --- a/Yesod/Form/Fields.hs +++ b/Yesod/Form/Fields.hs @@ -114,6 +114,7 @@ boolField ffs orig = GForm $ do , fiErrors = case res of FormFailure [x] -> Just $ string x _ -> Nothing + , fiRequired = True } return (res, [fi], UrlEncoded) @@ -161,6 +162,7 @@ selectField pairs ffs initial = GForm $ do , fiErrors = case res of FormFailure [x] -> Just $ string x _ -> Nothing + , fiRequired = True } return (res, [fi], UrlEncoded) @@ -203,6 +205,7 @@ maybeSelectField pairs ffs initial' = GForm $ do , fiErrors = case res of FormFailure [x] -> Just $ string x _ -> Nothing + , fiRequired = False } return (res, [fi], UrlEncoded)