BUGFIX, Attempt 2: Authorization for Admins without schools fixed.

src/Foundation.hs

@@ -204,21 +204,21 @@ submissionAccess cID = do
 
 adminAccess :: Maybe (Maybe SchoolId) -- ^ If @Just@, matched exactly against 'userAdminSchool'
             -> YesodDB UniWorX AuthResult
-adminAccess school = do
+adminAccess school = do    
   authId <- lift requireAuthId
-  schools <- map (userAdminSchool . entityVal) <$> selectList [UserAdminUser ==. authId] []
+  rights <- selectList [UserAdminUser ==. authId, UserAdminSchool <-. catMaybes [school,Just Nothing]] []  
-  return $ case maybe (null schools) (`elem` schools) school of
+  return $ if (not $ null rights) 
-    True  -> Authorized
+    then Authorized
-    False -> Unauthorized "No admin access"
+    else Unauthorized "No admin access"
 
 lecturerAccess :: Maybe SchoolId
                -> YesodDB UniWorX AuthResult
 lecturerAccess school = do
   authId <- lift requireAuthId
-  schools <- map (userLecturerSchool . entityVal) <$> selectList [UserLecturerUser ==. authId] []
+  rights <- selectList ((UserLecturerUser ==. authId) : maybe [] (\s -> [UserLecturerSchool ==. s]) school) []  
-  return $ case maybe (null schools) (`elem` schools) school of
+  return $ if (not $ null rights)
-    True  -> Authorized
+    then Authorized
-    False -> Unauthorized "No lecturer access"
+    else Unauthorized "No lecturer access"
 
 courseLecturerAccess :: CourseId -> YesodDB UniWorX AuthResult
 courseLecturerAccess courseId = do

src/Handler/Course.hs

@@ -73,7 +73,7 @@ getCourseListTermR tidini = do
   defaultLinkLayout pageLinks $ do
 --   defaultLayout $ do
     setTitle "Semesterkurse"  
-    -- linkButton "Neuen Kurs anlegen" BCPrimary CourseEditR
+    linkButton "Neuen Kurs anlegen" BCPrimary CourseEditR
     encodeHeadedWidgetTable tableDefault colonnadeTerms courses -- (map entityVal courses)
 
 getCourseShowR :: TermIdentifier -> Text -> Handler Html