diff --git a/Handler/AdminProfileSettings.hs b/Handler/AdminProfileSettings.hs index 0ad032e..98cde02 100755 --- a/Handler/AdminProfileSettings.hs +++ b/Handler/AdminProfileSettings.hs @@ -150,15 +150,15 @@ getAdminProfileDeleteR ownerId = do case tempOwner of Just owner -> do let albumList = userAlbums owner - _ <- mapM (\albumId -> do + mapM_ (\albumId -> do album <- runDB $ getJust albumId let mediaList = albumContent album - _ <- mapM (\med -> do + mapM_ (\med -> do -- delete comments commEnts <- runDB $ selectList [CommentOrigin ==. med] [] - _ <- mapM (\ent -> do + mapM_ (\ent -> do children <- runDB $ selectList [CommentParent ==. (Just $ entityKey ent)] [] - _ <- mapM (\child -> do + mapM_ (\child -> do -- delete comment children runDB $ delete $ entityKey child ) children @@ -169,7 +169,6 @@ getAdminProfileDeleteR ownerId = do liftIO $ removeFile (normalise $ L.tail $ mediumThumb medium) liftIO $ removeFile (normalise $ L.tail $ mediumPreview medium) -- delete medium database entry and search - ium <- runDB $ getJust med runDB $ delete med ) mediaList runDB $ delete albumId diff --git a/Handler/Reactivate.hs b/Handler/Reactivate.hs index 8abf52c..a5a50cc 100755 --- a/Handler/Reactivate.hs +++ b/Handler/Reactivate.hs @@ -22,14 +22,14 @@ import Data.Text.Encoding getReactivateR :: Handler Html getReactivateR = do - (reactivateWidget, enctype) <- generateFormPost reactivateForm + (reactivateWidget, enctype) <- generateFormPost $ renderBootstrap3 BootstrapBasicForm $ reactivateForm formLayout $ do setTitle "Eidolon :: Reactivate account" $(widgetFile "reactivate") postReactivateR :: Handler Html postReactivateR = do - ((result, _), _) <- runFormPost reactivateForm + ((result, _), _) <- runFormPost $ renderBootstrap3 BootstrapBasicForm $ reactivateForm case result of FormSuccess temp -> do users <- runDB $ selectList [UserEmail ==. temp] [] @@ -66,6 +66,7 @@ postReactivateR = do setMessage "There is something wrong with your email" redirect $ ReactivateR -reactivateForm :: Form Text -reactivateForm = renderDivs $ (\a -> a) - <$> areq emailField "Email" Nothing +reactivateForm :: AForm Handler Text +reactivateForm = id + <$> areq emailField (bfs ("Email" :: Text)) Nothing + <* bootstrapSubmit ("Send" :: BootstrapSubmit Text) diff --git a/templates/activate.hamlet b/templates/activate.hamlet index a25ca2e..f9be960 100755 --- a/templates/activate.hamlet +++ b/templates/activate.hamlet @@ -1,16 +1,17 @@ $newline always -
+