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

Fix instructors ordering on program marketing page

Browse Source 
Changed to hold the instructors in a list instead of a dict
because a dict does not keep ordering.
This commit is contained in:
Matt Tuchfarber
2017-11-16 16:04:40 -05:00
parent 3132d29ca5
commit 2c67f9647b
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
openedx/core/djangoapps/programs/utils.py
View File

@@ -605,8 +605,8 @@ class ProgramMarketingDataExtender(ProgramDataExtender):
def __init__(self, program_data, user):
super(ProgramMarketingDataExtender, self).__init__(program_data, user)
# Aggregate dict of instructors for the program keyed by name
self.instructors = {}
# Aggregate list of instructors for the program
self.instructors = []
# Values for programs' price calculation.
self.data['avg_price_per_course'] = 0.0
@@ -628,7 +628,7 @@ class ProgramMarketingDataExtender(ProgramDataExtender):
if not program_instructors:
# We cache the program instructors list to avoid repeated modulestore queries
program_instructors = self.instructors.values()
program_instructors = self.instructors
cache.set(cache_key, program_instructors, 3600)
self.data['instructors'] = program_instructors
@@ -688,6 +688,7 @@ class ProgramMarketingDataExtender(ProgramDataExtender):
course_instructors = getattr(course_descriptor, 'instructor_info', {})
# Deduplicate program instructors using instructor name
self.instructors.update(
{instructor.get('name', '').strip(): instructor for instructor in course_instructors.get('instructors', [])}
)
curr_instructors_names = [instructor.get('name', '').strip() for instructor in self.instructors]
for instructor in course_instructors.get('instructors', []):
if instructor.get('name', '').strip() not in curr_instructors_names:
self.instructors.append(instructor)