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

Merge pull request #17388 from edx/aj/entitlement_leave_session

Browse Source 
Updates to allow leaving a session on entitlements with only 1 run
This commit is contained in:
Albert (AJ) St. Aubin
2018-02-01 14:19:37 -05:00
committed by GitHub
parent 61306c8f10 97165d3460
commit 0b9cf78355
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -325,8 +325,13 @@ def get_fulfillable_course_runs_for_entitlement(entitlement, course_runs):
for course_run in course_runs:
course_id = CourseKey.from_string(course_run.get('key'))
is_enrolled = CourseEnrollment.is_enrolled(entitlement.user, course_id)
if is_course_run_entitlement_fullfillable(course_id, entitlement, search_time) and not is_enrolled:
enrollable_sessions.append(course_run)
if is_course_run_entitlement_fullfillable(course_id, entitlement, search_time):
if (is_enrolled and
entitlement.enrollment_course_run and
course_id == entitlement.enrollment_course_run.course_id):
enrollable_sessions.append(course_run)
elif not is_enrolled:
enrollable_sessions.append(course_run)
enrollable_sessions.sort(key=lambda session: session.get('start'))
return enrollable_sessions