diff --git a/yesod-form/Yesod/Form/Functions.hs b/yesod-form/Yesod/Form/Functions.hs index ec97dd8b..7b00b7ae 100644 --- a/yesod-form/Yesod/Form/Functions.hs +++ b/yesod-form/Yesod/Form/Functions.hs @@ -55,6 +55,8 @@ import Data.Maybe (listToMaybe, fromMaybe) import Yesod.Message (RenderMessage (..)) import qualified Data.Map as Map import qualified Data.ByteString.Lazy as L +import Control.Applicative ((<$>)) +import Control.Arrow (first) -- | Get a unique identifier. newFormIdent :: MForm sub master Text @@ -197,8 +199,8 @@ postHelper form env = do generateFormPost :: RenderMessage master FormMessage => (Html -> MForm sub master (FormResult a, xml)) - -> GHandler sub master ((FormResult a, xml), Enctype) -generateFormPost form = postHelper form Nothing + -> GHandler sub master (xml, Enctype) +generateFormPost form = first snd <$> postHelper form Nothing postEnv :: GHandler sub master (Maybe (Env, FileEnv)) postEnv = do diff --git a/yesod/scaffold/Handler/Home.hs.cg b/yesod/scaffold/Handler/Home.hs.cg index bc34e416..3444a5ba 100644 --- a/yesod/scaffold/Handler/Home.hs.cg +++ b/yesod/scaffold/Handler/Home.hs.cg @@ -12,7 +12,7 @@ import Import -- inclined, or create a single monolithic file. getHomeR :: Handler RepHtml getHomeR = do - ((_, formWidget), formEnctype) <- generateFormPost sampleForm + (formWidget, formEnctype) <- generateFormPost sampleForm let submission = Nothing :: Maybe (FileInfo, Text) handlerName = "getHomeR" :: Text defaultLayout $ do