From 374cb6250d56c8527800948ed623bc356497bb44 Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <>
Date: Mon, 9 Nov 2020 17:59:51 +0100
Subject: [PATCH] fix(schedule-opt): account for course schedule opt in
 tutorial actions

---
 src/Handler/Course/Show.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Handler/Course/Show.hs b/src/Handler/Course/Show.hs
index adcc74bed..d8a5cddb2 100644
--- a/src/Handler/Course/Show.hs
+++ b/src/Handler/Course/Show.hs
@@ -195,7 +195,7 @@ getCShowR tid ssh csh = do
               tutScheduleOptSet <- if
                 | Just (uid,User{..}) <- mbAuth -> do
                     mScheduleOpt <- getBy $ UniqueTutorialScheduleOpt tutId uid
-                    let currentOpt = maybe (isRegistered && userScheduleOccurrenceDisplayDefault) tutorialScheduleOptOpt $ entityVal <$> mScheduleOpt
+                    let currentOpt = maybe (maybe (isRegistered && userScheduleOccurrenceDisplayDefault) (courseScheduleOptOpt . entityVal) mCourseScheduleOpt) tutorialScheduleOptOpt $ entityVal <$> mScheduleOpt
                     (tutScheduleForm, tutScheduleEnctype) <- liftHandler . generateFormPost . buttonForm' $ bool [BtnScheduleOptIn] [BtnScheduleOptOut] currentOpt
                     return $ wrapForm tutScheduleForm def
                       { formAction = Just . SomeRoute $ CTutorialR tid ssh csh tutorialName (TScheduleOptSetR $ not currentOpt)