haskell/yesod
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Recent yesod-core changes

Browse Source
This commit is contained in:
Michael Snoyman 2011-01-13 22:31:00 +02:00
parent fef56bd3a2
commit f219370b06
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Yesod/Form.hs
View File

@ -56,13 +56,13 @@ import Yesod.Request
import Yesod.Handler import Yesod.Handler
import Control.Applicative hiding (optional) import Control.Applicative hiding (optional)
import Data.Maybe (fromMaybe, mapMaybe) import Data.Maybe (fromMaybe, mapMaybe)
import "transformers" Control.Monad.IO.Class
import Control.Monad ((<=<)) import Control.Monad ((<=<))
import Language.Haskell.TH.Syntax import Language.Haskell.TH.Syntax hiding (lift)
import Database.Persist.Base (EntityDef (..), PersistEntity (entityDef)) import Database.Persist.Base (EntityDef (..), PersistEntity (entityDef))
import Data.Char (toUpper, isUpper) import Data.Char (toUpper, isUpper)
import Control.Arrow ((&&&)) import Control.Arrow ((&&&))
import Data.List (group, sort) import Data.List (group, sort)
import Control.Monad.Trans.Class (lift)
-- | Display only the actual input widget code, without any decoration. -- | Display only the actual input widget code, without any decoration.
fieldsToPlain :: FormField sub y a -> Form sub y a fieldsToPlain :: FormField sub y a -> Form sub y a
@ -113,7 +113,7 @@ fieldsToDivs = mapFormXml $ mapM_ go
runFormPostNoNonce :: GForm s m xml a -> GHandler s m (FormResult a, xml, Enctype) runFormPostNoNonce :: GForm s m xml a -> GHandler s m (FormResult a, xml, Enctype)
runFormPostNoNonce f = do runFormPostNoNonce f = do
rr <- getRequest rr <- getRequest
(pp, files) <- liftIO $ reqRequestBody rr (pp, files) <- lift $ reqRequestBody rr
runFormGeneric pp files f runFormGeneric pp files f
-- | Run a form against POST parameters. -- | Run a form against POST parameters.
@ -124,7 +124,7 @@ runFormPostNoNonce f = do
runFormPost :: GForm s m xml a -> GHandler s m (FormResult a, xml, Enctype, Html) runFormPost :: GForm s m xml a -> GHandler s m (FormResult a, xml, Enctype, Html)
runFormPost f = do runFormPost f = do
rr <- getRequest rr <- getRequest
(pp, files) <- liftIO $ reqRequestBody rr (pp, files) <- lift $ reqRequestBody rr
nonce <- fmap reqNonce getRequest nonce <- fmap reqNonce getRequest
(res, xml, enctype) <- runFormGeneric pp files f (res, xml, enctype) <- runFormGeneric pp files f
let res' = let res' =
@ -153,7 +153,7 @@ nonceName = "_nonce"
runFormMonadPost :: GFormMonad s m a -> GHandler s m (a, Enctype) runFormMonadPost :: GFormMonad s m a -> GHandler s m (a, Enctype)
runFormMonadPost f = do runFormMonadPost f = do
rr <- getRequest rr <- getRequest
(pp, files) <- liftIO $ reqRequestBody rr (pp, files) <- lift $ reqRequestBody rr
runFormGeneric pp files f runFormGeneric pp files f
-- | Run a form against POST parameters, disregarding the resulting HTML and -- | Run a form against POST parameters, disregarding the resulting HTML and
@ -162,7 +162,7 @@ runFormMonadPost f = do
runFormPost' :: GForm sub y xml a -> GHandler sub y a runFormPost' :: GForm sub y xml a -> GHandler sub y a
runFormPost' f = do runFormPost' f = do
rr <- getRequest rr <- getRequest
(pp, files) <- liftIO $ reqRequestBody rr (pp, files) <- lift $ reqRequestBody rr
x <- runFormGeneric pp files f x <- runFormGeneric pp files f
helper x helper x