From 7a511b2c501a601686d420998bf40bb7f00c41c7 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Wed, 30 Jan 2019 10:55:31 +0100 Subject: [PATCH 1/2] Minor cleanup --- src/Handler/Corrections.hs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/Handler/Corrections.hs b/src/Handler/Corrections.hs index 5b8cd35c7..1fece3778 100644 --- a/src/Handler/Corrections.hs +++ b/src/Handler/Corrections.hs @@ -479,11 +479,9 @@ assignAction selId = ( CorrSetCorrector E.distinct $ return user - mr <- getMessageRender + correctors' <- forM correctors $ \Entity{ entityKey, entityVal = User{..} } -> (SomeMessage userDisplayName, ) <$> encrypt entityKey - correctors' <- fmap ((mr MsgNoCorrector, Nothing) :) . forM correctors $ \Entity{ entityKey, entityVal = User{..} } -> (display userDisplayName, ) . Just <$> encrypt entityKey - - cId <- wpreq (selectFieldList correctors' :: Field (HandlerT UniWorX IO) (Maybe CryptoUUIDUser)) (fslI MsgCorrector) Nothing + cId <- wopt (selectFieldList correctors' :: Field (HandlerT UniWorX IO) CryptoUUIDUser) (fslI MsgCorrector) Nothing fmap CorrSetCorrectorData <$> (traverse.traverse) decrypt cId ) From 06d44a42926d6d3e8a6ea6c8022251ded664df8a Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Wed, 30 Jan 2019 11:12:35 +0100 Subject: [PATCH 2/2] Minor cleanup --- src/Foundation.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Foundation.hs b/src/Foundation.hs index 901c6c124..b3dfb271f 100644 --- a/src/Foundation.hs +++ b/src/Foundation.hs @@ -269,7 +269,7 @@ instance HasRoute UniWorX MenuItem where urlRoute MenuItem{..} = urlRoute menuItemRoute menuItemAccessCallback :: MenuItem -> Handler Bool -menuItemAccessCallback MenuItem{..} = (&&) <$> ((==) Authorized <$> authCheck) <*> menuItemAccessCallback' +menuItemAccessCallback MenuItem{..} = and2M ((==) Authorized <$> authCheck) menuItemAccessCallback' where authCheck = handleAny (\_ -> return . Unauthorized $ error "authCheck caught exception") $ isAuthorized (urlRoute menuItemRoute) False