Merge branch 'master' into release-mergeback-to-master

2017-12-21 16:50:24 -05:00
parent 62b025e889 0d2921bf23
commit 579435bcd7
46 changed files with 882 additions and 28 deletions
--- a/openedx/core/djangoapps/catalog/utils.py
+++ b/openedx/core/djangoapps/catalog/utils.py
@@ -262,11 +262,13 @@ def get_fulfillable_course_runs_for_entitlement(entitlement, course_runs):

    These are the only sessions that can be selected for an entitlement.
    """
+
    enrollable_sessions = []

    # Only show published course runs that can still be enrolled and upgraded
    now = datetime.datetime.now(UTC)
    for course_run in course_runs:
+
        # Only courses that have not ended will be displayed
        run_start = course_run.get('start')
        run_end = course_run.get('end')