Merge branch 'main' into BC-5809-students-can-open-topic-in-draft-mode

hpi-schul-cloud · Dec 22, 2023 · c684604 · c684604
2 parents 3087741 + 98486f8
commit c684604
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/controllers/courses.js b/controllers/courses.js
@@ -132,7 +132,7 @@ const editCourseHandler = (req, res, next) => {
 	let classesPromise;
 	if (FEATURE_GROUPS_IN_COURSE_ENABLED) {
 		classesAndGroupsPromise = api(req, { version: 'v3' })
-			.get('/groups/class', { qs: { limit: -1 } });
+			.get('/groups/class', { qs: { limit: -1, calledFrom: 'course' } });
 	} else {
 		classesPromise = api(req)
 			.get('/classes', {

diff --git a/controllers/login.js b/controllers/login.js
@@ -320,7 +320,7 @@ const determineRedirectUrl = (req) => {
 
 const filterSchoolsWithLdapLogin = (schools) => schools
 // eslint-disable-next-line max-len
-	.filter((school) => school.systems.some((system) => system.type === 'ldap' && !system.oauthConfig));
+	.filter((school) => school.systems?.some((system) => system.type === 'ldap' && !system.oauthConfig));
 
 async function getOauthSystems(req) {
 	return api(req, { version: 'v3' })