Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #12155 from edx/christina/allow-multiple-random-cohorts

Browse Source 
Allow multiple random cohorts.
This commit is contained in:
Christina Roberts
2016-04-14 17:49:37 -04:00
parent 0c9f9d4682 1cd54d5fb7
commit 08a8164201
4 changed files with 44 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
openedx/core/djangoapps/course_groups/cohorts.py
View File

@@ -430,7 +430,7 @@ def set_assignment_type(user_group, assignment_type):
"""
course_cohort = user_group.cohort
if is_default_cohort(user_group) and course_cohort.assignment_type != assignment_type:
if is_last_random_cohort(user_group) and course_cohort.assignment_type != assignment_type:
raise ValueError(_("There must be one cohort to which students can automatically be assigned."))
course_cohort.assignment_type = assignment_type
@@ -445,9 +445,9 @@ def get_assignment_type(user_group):
return course_cohort.assignment_type
def is_default_cohort(user_group):
def is_last_random_cohort(user_group):
"""
Check if a cohort is default.
Check if this cohort is the only random cohort in the course.
"""
random_cohorts = CourseUserGroup.objects.filter(
course_id=user_group.course_id,