From 8b0737e2aabc7153ae3a3df4f97f86ffc8592e7a Mon Sep 17 00:00:00 2001 From: Steffen Jost Date: Mon, 11 Sep 2023 16:01:43 +0000 Subject: [PATCH] fix(lms): reset e-learning more lenient --- src/Handler/LMS.hs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Handler/LMS.hs b/src/Handler/LMS.hs index 2e7b27b3c..dff707d1a 100644 --- a/src/Handler/LMS.hs +++ b/src/Handler/LMS.hs @@ -391,9 +391,9 @@ isResetAct :: LmsTableActionData -> Bool isResetAct LmsActResetData{} = True isResetAct _ = False -isRestartResetAct :: LmsTableActionData -> Bool -isRestartResetAct LmsActRestartData{} = True -isRestartResetAct other = isResetAct other +isResetRestartAct :: LmsTableActionData -> Bool +isResetRestartAct LmsActRestartData{} = True +isResetRestartAct other = isResetAct other lmsTableQuery :: QualificationId -> LmsTableExpr @@ -707,7 +707,7 @@ postLmsR sid qsh = do formResult lmsRes $ \case _ | not isAdmin -> addMessageI Error MsgUnauthorized -- only admins can use the form on this page - (action, selectedUsers) | isRestartResetAct action -> do + (action, selectedUsers) | isResetRestartAct action -> do let usersList = Set.toList selectedUsers numUsers = Set.size selectedUsers isReset = isResetAct action @@ -730,7 +730,7 @@ postLmsR sid qsh = do forM_ shortUsers $ upsertQualificationUser qid nowaday cutoff Nothing fromIntegral <$> (if isReset - then updateWhereCount ([LmsUserQualification ==. qid, LmsUserUser <-. usersList, LmsUserResetTries ==. False, LmsUserLocked ==. True] + then updateWhereCount ([LmsUserQualification ==. qid, LmsUserUser <-. usersList, LmsUserResetTries ==. False] -- , LmsUserLocked ==. True] -- needs to be locked for reset, but this is counter-intuitive for users; should be harmles, but delays reset until lock is effective ++ ([LmsUserStatus ==. Just LmsBlocked] ||. [LmsUserStatus ==. Just LmsExpired])) [LmsUserResetTries =. True] else deleteWhereCount [LmsUserQualification ==. qid, LmsUserUser <-. usersList] )