From 6f3243d90bdc137e7f2ea9fe8e271f1cdc32dfbd Mon Sep 17 00:00:00 2001 From: ros Date: Sat, 22 May 2021 11:59:46 +0200 Subject: [PATCH] feat(participants): small Name-change --- src/Application.hs | 1 + src/Handler/Participants.hs | 4 ++-- templates/participants-intersect.hamlet | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/Application.hs b/src/Application.hs index bcaf1edda..0da9b1248 100644 --- a/src/Application.hs +++ b/src/Application.hs @@ -708,3 +708,4 @@ addPWEntry User{ userAuthentication = _, ..} (Text.encodeUtf8 -> pw) = db' $ do PWHashConf{..} <- getsYesod $ view _appAuthPWHash (AuthPWHash . Text.decodeUtf8 -> userAuthentication) <- liftIO $ makePasswordWith pwHashAlgorithm pw pwHashStrength void $ insert User{..} + diff --git a/src/Handler/Participants.hs b/src/Handler/Participants.hs index c3bd086bb..297f535d9 100644 --- a/src/Handler/Participants.hs +++ b/src/Handler/Participants.hs @@ -110,8 +110,8 @@ postParticipantsIntersectR = do -> Set.size $ Map.findWithDefault Set.empty lCid courseUsers `Set.intersection` Map.findWithDefault Set.empty uCid courseUsers selfIntersections = Map.mapKeysMonotonic (\cid -> (cid, cid)) $ Set.size <$> courseUsers intersections' = Map.union intersections selfIntersections - let allUsers = setIntersectAll $ Map.elems courseUsers - let mapIntersect = mapIntersectNotOne courseUsers + -- let allUsers = setUnionAll $ Map.elems courseUsers + -- let mapIntersect = mapIntersectNotOne courseUsers return (courses, intersections') let diff --git a/templates/participants-intersect.hamlet b/templates/participants-intersect.hamlet index 5e24254ed..8519ba33b 100644 --- a/templates/participants-intersect.hamlet +++ b/templates/participants-intersect.hamlet @@ -23,4 +23,4 @@ $maybe (courses, intersections) <- intersectionsRes $with n <- symmIntersection intersections lCid uCid $if showNumber n lCid uCid - #{n} + #{n} \ No newline at end of file