diff --git a/src/Handler/Users.hs b/src/Handler/Users.hs index e5ff76fea..c5968789f 100644 --- a/src/Handler/Users.hs +++ b/src/Handler/Users.hs @@ -101,7 +101,7 @@ getUsersR = do | Set.null criterion -> eTrue -- TODO: why can this be eFalse and work still? | otherwise -> -- (user E.^. UserMatrikelnummer) `E.in_` (E.valList $ Set.toList criterion) - (user E.^. UserMatrikelnummer) `E.in_` (E.justList $ E.valList $ Set.toList criterion) + user E.^. UserMatrikelnummer `E.in_` E.justList (E.valList $ Set.toList criterion) ) , ( "school", FilterColumn $ \user criterion -> if | Set.null criterion -> E.val True :: E.SqlExpr (E.Value Bool) diff --git a/test/Database.hs b/test/Database.hs index e13baca9b..2fc8a7dc5 100755 --- a/test/Database.hs +++ b/test/Database.hs @@ -41,7 +41,7 @@ argsDescr = , Option ['f'] ["fill"] (NoArg DBFill) "Fill database with example data" ] - + main :: IO () main = do args <- map unpack <$> getArgs @@ -141,7 +141,7 @@ fillDb = do maxMuster <- insert User { userIdent = "max@campus.lmu.de" , userAuthentication = AuthLDAP - , userMatrikelnummer = Nothing + , userMatrikelnummer = Just "1299" , userEmail = "max@campus.lmu.de" , userDisplayName = "Max Musterstudent" , userSurname = "Musterstudent" @@ -325,7 +325,7 @@ fillDb = do , sheetMarkingText = Nothing , sheetVisibleFrom = Just now , sheetActiveFrom = now - , sheetActiveTo = (14 * nominalDay) `addUTCTime` now + , sheetActiveTo = (14 * nominalDay) `addUTCTime` now , sheetSubmissionMode = CorrectorSubmissions , sheetUploadMode = Upload True , sheetHintFrom = Nothing