From 378b1f86c666752f7c917a1dd8f995f536c68dfa Mon Sep 17 00:00:00 2001 From: Diana Huang Date: Mon, 3 Jul 2017 14:23:13 -0400 Subject: [PATCH] Replace urls in plan html updates. --- openedx/features/course_experience/views/course_updates.py | 6 +++++- openedx/features/course_experience/views/welcome_message.py | 4 +--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/openedx/features/course_experience/views/course_updates.py b/openedx/features/course_experience/views/course_updates.py index 4e696b884d..1daec2c6a7 100644 --- a/openedx/features/course_experience/views/course_updates.py +++ b/openedx/features/course_experience/views/course_updates.py @@ -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): diff --git a/openedx/features/course_experience/views/welcome_message.py b/openedx/features/course_experience/views/welcome_message.py index bf4e6452dc..47aa4f8c09 100644 --- a/openedx/features/course_experience/views/welcome_message.py +++ b/openedx/features/course_experience/views/welcome_message.py @@ -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