reverting tinkering

This commit is contained in:
nek0 2016-03-02 09:49:48 +01:00
parent cd58dfde69
commit 98767bb01c
2 changed files with 14 additions and 32 deletions

View file

@ -69,20 +69,20 @@ renderLayout widget = do
route <- getCurrentRoute
mmsg <- getMessage
msu <- lookupSession "userId"
-- username <- case msu of
-- Just a -> do
-- let uId = getUserIdFromText a
-- user <- runDB $ getJust uId
-- return $ userName user
-- Nothing ->
-- return ("" :: T.Text)
-- slug <- case msu of
-- Just a -> do
-- let uId = getUserIdFromText a
-- user <- runDB $ getJust uId
-- return $ userSlug user
-- Nothing ->
-- return ("" :: T.Text)
username <- case msu of
Just a -> do
let uId = getUserIdFromText a
user <- runDB $ getJust uId
return $ userName user
Nothing ->
return ("" :: T.Text)
slug <- case msu of
Just a -> do
let uId = getUserIdFromText a
user <- runDB $ getJust uId
return $ userSlug user
Nothing ->
return ("" :: T.Text)
let block = appSignupBlocked $ appSettings master
-- We break up the default layout into two components:

View file

@ -41,24 +41,6 @@ import Network.HTTP.Client
import Network.HTTP.Types.Status as S
import Control.Monad (when)
getUsername :: Maybe T.Text -> Handler (Maybe T.Text)
getUsername mtid =
getSkel mtid userName
getSlug :: Maybe T.Text -> Handler (Maybe T.Text)
getSlug mtid =
getSkel mtid userSlug
getSkel :: Maybe T.Text -> (User -> a) -> Handler (Maybe a)
getSkel mtid fun =
case mtid of
Just tid -> do
let uId = getUserIdFromText tid
user <- runDB $ getJust uId
return $ Just $ fun user
Nothing ->
return Nothing
getUserIdFromText :: T.Text -> UserId
getUserIdFromText tempUserId =
case key of