Replace urls in plan html updates.

This commit is contained in:
Diana Huang
2017-07-03 14:23:13 -04:00
parent 8838162abb
commit 378b1f86c6
2 changed files with 6 additions and 4 deletions

View File

@@ -79,11 +79,14 @@ class CourseUpdatesFragmentView(EdxFragmentView):
info_module = get_course_info_section_module(request, request.user, course, 'updates')
updates = info_module.items if info_module else []
info_block = getattr(info_module, '_xmodule', info_module) if info_module else None
ordered_updates = [update for update in updates if update.get('status') == self.STATUS_VISIBLE]
ordered_updates.sort(
key=lambda item: (self.safe_parse_date(item['date']), item['id']),
reverse=True
)
for update in ordered_updates:
update['content'] = info_block.system.replace_urls(update['content'])
return ordered_updates
@classmethod
@@ -98,7 +101,8 @@ class CourseUpdatesFragmentView(EdxFragmentView):
a single html object representing all the updates.
"""
info_module = get_course_info_section_module(request, request.user, course, 'updates')
return info_module.data if info_module else ''
info_block = getattr(info_module, '_xmodule', info_module)
return info_block.system.replace_urls(info_module.data) if info_module else ''
@staticmethod
def safe_parse_date(date):

View File

@@ -57,9 +57,7 @@ class WelcomeMessageFragmentView(EdxFragmentView):
ordered_updates = CourseUpdatesFragmentView.get_ordered_updates(request, course)
content = None
if ordered_updates:
info_module = get_course_info_section_module(request, request.user, course, 'updates')
info_block = getattr(info_module, '_xmodule', info_module)
content = info_block.system.replace_urls(ordered_updates[0]['content'])
content = ordered_updates[0]['content']
return content