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

correct check for enrollment on an entitlement

Browse Source 
[LEARNER-4484]
This commit is contained in:
Albert St. Aubin
2018-03-08 13:45:54 -05:00
parent 9bddcf5546
commit 7acff0a39e
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
openedx/core/djangoapps/catalog/utils.py
View File

@@ -389,13 +389,17 @@ def get_fulfillable_course_runs_for_entitlement(entitlement, course_runs):
search_time = datetime.datetime.now(UTC)
for course_run in course_runs:
course_id = CourseKey.from_string(course_run.get('key'))
is_enrolled = CourseEnrollment.is_enrolled(entitlement.user, course_id)
(user_enrollment_mode, is_active) = CourseEnrollment.enrollment_mode_for_user(
user=entitlement.user,
course_id=course_id
)
is_enrolled_in_mode = user_enrollment_mode == entitlement.mode
if is_course_run_entitlement_fulfillable(course_id, entitlement, search_time):
if (is_enrolled and
if (is_enrolled_in_mode and
entitlement.enrollment_course_run and
course_id == entitlement.enrollment_course_run.course_id):
enrollable_sessions.append(course_run)
elif not is_enrolled:
elif not is_enrolled_in_mode:
enrollable_sessions.append(course_run)
enrollable_sessions.sort(key=lambda session: session.get('start'))