From 71a38cf449dfcfdff8ddabaca0368dfe2090ec83 Mon Sep 17 00:00:00 2001 From: David Ormsbee Date: Mon, 1 Jun 2020 19:45:47 -0400 Subject: [PATCH] Revert "AA-158: Fix date ordering for multiple events on the same date" --- lms/djangoapps/courseware/courses.py | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/lms/djangoapps/courseware/courses.py b/lms/djangoapps/courseware/courses.py index 747751871d..d060ef481f 100644 --- a/lms/djangoapps/courseware/courses.py +++ b/lms/djangoapps/courseware/courses.py @@ -461,17 +461,7 @@ def get_course_date_blocks(course, user, request=None, include_access=False, Return the list of blocks to display on the course info page, sorted by date. """ - blocks = [] - if RELATIVE_DATES_FLAG.is_enabled(course.id): - blocks.append(CourseExpiredDate(course, user)) - blocks.extend(get_course_assignment_date_blocks( - course, user, request, num_return=num_assignments, - include_access=include_access, include_past_dates=include_past_dates, - )) - - # Adding these in after the assignment blocks so in the case multiple blocks have the same date, - # these blocks will be sorted to come after the assignments. See https://openedx.atlassian.net/browse/AA-158 - default_block_classes = [ + block_classes = [ CourseEndDate, CourseStartDate, TodaysDate, @@ -481,7 +471,13 @@ def get_course_date_blocks(course, user, request=None, include_access=False, if not course.self_paced and certs_api.get_active_web_certificate(course): block_classes.insert(0, CertificateAvailableDate) - blocks.extend([cls(course, user) for cls in default_block_classes]) + blocks = [cls(course, user) for cls in block_classes] + if RELATIVE_DATES_FLAG.is_enabled(course.id): + blocks.append(CourseExpiredDate(course, user)) + blocks.extend(get_course_assignment_date_blocks( + course, user, request, num_return=num_assignments, + include_access=include_access, include_past_dates=include_past_dates, + )) return sorted((b for b in blocks if b.date and (b.is_enabled or include_past_dates)), key=date_block_key_fn)