From 90d3135f15c4c857f15e2cf65c29420343363b69 Mon Sep 17 00:00:00 2001 From: SJost Date: Mon, 18 Feb 2019 20:27:15 +0100 Subject: [PATCH] Fixes #291 --- src/Handler/Users.hs | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/Handler/Users.hs b/src/Handler/Users.hs index 36f6aa241..fe0f6d72f 100644 --- a/src/Handler/Users.hs +++ b/src/Handler/Users.hs @@ -8,6 +8,7 @@ import Utils.Lens import qualified Data.CaseInsensitive as CI +import Data.List (nub) import qualified Data.Set as Set import qualified Data.Map as Map @@ -23,9 +24,6 @@ hijackUserForm cID csrf = do getUsersR :: Handler Html getUsersR = do - -- schoolOptions <- runDB $ do - -- courses <- selectList [] [Asc CourseSchool] -- >>= filterM (\(Entity _ Course{..}) -> (== Authorized) <$> evalAccessCorrector courseTerm courseSchool courseShorthand) - -- optionsPairs $ map (id &&& id) $ nub $ map (CI.original . unSchoolKey . courseSchool . entityVal) courses let dbtColonnade = dbColonnade . mconcat $ [ dbRow @@ -74,6 +72,10 @@ getUsersR = do psValidator = def & defaultSorting [SortAscBy "name", SortAscBy "display-name"] + schoolOptions = runDB $ do + courses <- selectList [] [Asc CourseSchool] -- >>= filterM (\(Entity _ Course{..}) -> (== Authorized) <$> evalAccessCorrector courseTerm courseSchool courseShorthand) + optionsPairs $ map (id &&& id) $ nub $ map (CI.original . unSchoolKey . courseSchool . entityVal) courses + ((), userList) <- runDB $ dbTable psValidator DBTable { dbtSQLQuery = return :: E.SqlExpr (Entity User) -> E.SqlQuery (E.SqlExpr (Entity User)) , dbtRowKey = (E.^. UserId) @@ -118,8 +120,8 @@ getUsersR = do -- , prismAForm (singletonFilter "matriculation" ) mPrev $ aopt (searchField False) (fslI MsgMatrikelNr) , prismAForm (singletonFilter "matriculation" ) mPrev $ aopt matriculationField (fslI MsgMatrikelNr) - -- , prismAForm (singletonFilter "school" ) mPrev $ aopt (selectField schoolOptions) (fslI MsgCourseSchool) - -- , prismAForm (singletonFilter "school" ) mPrev $ aopt (lift `hoistField` schoolField) (fslI MsgCourseSchool) + , prismAForm (singletonFilter "school" ) mPrev $ aopt (lift `hoistField` (selectField schoolOptions)) (fslI MsgCourseSchool) + --, prismAForm (singletonFilter "school" ) mPrev $ aopt (lift `hoistField` schoolField) (fslI MsgCourseSchool) ] , dbtStyle = def { dbsFilterLayout = defaultDBSFilterLayout } , dbtParams = def