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

Merge pull request #825 from yesodweb/confirm-email-status

Browse Source 
Confirm email status
This commit is contained in:
Greg Weber 2014-09-16 20:49:05 -05:00
commit 4f95cb9f64
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
yesod-auth/Yesod/Auth.hs
View File

@ -49,7 +49,7 @@ import Control.Monad (when)
import Control.Monad.Trans.Maybe import Control.Monad.Trans.Maybe
import Yesod.Auth.Routes import Yesod.Auth.Routes
import Data.Aeson import Data.Aeson hiding (json)
import Data.Text.Encoding (decodeUtf8With) import Data.Text.Encoding (decodeUtf8With)
import Data.Text.Encoding.Error (lenientDecode) import Data.Text.Encoding.Error (lenientDecode)
import Data.Text (Text) import Data.Text (Text)

6
yesod-auth/Yesod/Auth/Email.hs
View File

@ -36,9 +36,7 @@ import Yesod.Auth
import System.Random import System.Random
import qualified Data.Text as TS import qualified Data.Text as TS
import qualified Data.Text as T import qualified Data.Text as T
import qualified Data.Text.Lazy as TL
import qualified Data.Text.Encoding as TE import qualified Data.Text.Encoding as TE
import qualified Data.Text.Lazy.Encoding as TLE
import qualified Crypto.Hash.MD5 as H import qualified Crypto.Hash.MD5 as H
import Data.ByteString.Base16 as B16 import Data.ByteString.Base16 as B16
import Data.Text.Encoding (encodeUtf8, decodeUtf8With) import Data.Text.Encoding (encodeUtf8, decodeUtf8With)
@ -182,7 +180,9 @@ class ( YesodAuth site
confirmationEmailSentResponse :: Text -> HandlerT site IO TypedContent confirmationEmailSentResponse :: Text -> HandlerT site IO TypedContent
confirmationEmailSentResponse identifier = do confirmationEmailSentResponse identifier = do
mr <- getMessageRender mr <- getMessageRender
messageJson401 (mr msg) $ authLayout $ do selectRep $ do
provideJsonMessage (mr msg)
provideRep $ authLayout $ do
setTitleI Msg.ConfirmationEmailSentTitle setTitleI Msg.ConfirmationEmailSentTitle
[whamlet|<p>_{msg}|] [whamlet|<p>_{msg}|]
where where