diff --git a/src/Handler/Course/ParticipantInvite.hs b/src/Handler/Course/ParticipantInvite.hs index c2e01d7c5..f7c9ea350 100644 --- a/src/Handler/Course/ParticipantInvite.hs +++ b/src/Handler/Course/ParticipantInvite.hs @@ -93,7 +93,7 @@ participantInvitationConfig = InvitationConfig{..} invitationRestriction _ _ = return Authorized invitationForm _ _ _ = hoistAForm lift . wFormToAForm $ do now <- liftIO getCurrentTime - return . fmap (, ()) $ JunctionParticipant now <$> pure Nothing <*> pure CourseParticipantActive + return . pure . (, ()) $ JunctionParticipant now Nothing CourseParticipantActive invitationInsertHook _ _ (_, InvTokenDataParticipant{..}) CourseParticipant{..} _ act = do deleteBy $ UniqueParticipant courseParticipantUser courseParticipantCourse -- there are no foreign key references to @{CourseParticipant}; therefor we can delete and recreate to simulate upsert res <- act -- insertUnique diff --git a/src/Handler/Course/Users.hs b/src/Handler/Course/Users.hs index 68abfdcd3..f6c31ef4e 100644 --- a/src/Handler/Course/Users.hs +++ b/src/Handler/Course/Users.hs @@ -223,7 +223,7 @@ instance CsvColumnsExplained UserTableCsv where single :: RenderMessage UniWorX msg => Csv.Name -> msg -> Map Csv.Name Widget single k v = singletonMap k [whamlet|_{v}|] -data UserCsvExportData = UserCsvExportData +newtype UserCsvExportData = UserCsvExportData { csvUserIncludeSheets :: Bool } deriving (Eq, Ord, Read, Show, Generic, Typeable) instance Default UserCsvExportData where