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

Revert "AA-158: Fix date ordering for multiple events on the same date"

Browse Source
This commit is contained in:
David Ormsbee
2020-06-01 19:45:47 -04:00
committed by GitHub
parent 6281b0a96b
commit 71a38cf449
1 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lms/djangoapps/courseware/courses.py
View File

@@ -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, Return the list of blocks to display on the course info page,
sorted by date. sorted by date.
""" """
blocks = [] 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,
))
# 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 = [
CourseEndDate, CourseEndDate,
CourseStartDate, CourseStartDate,
TodaysDate, 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): if not course.self_paced and certs_api.get_active_web_certificate(course):
block_classes.insert(0, CertificateAvailableDate) 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) return sorted((b for b in blocks if b.date and (b.is_enabled or include_past_dates)), key=date_block_key_fn)