From da275eae1192912187923e29668221c53e24b747 Mon Sep 17 00:00:00 2001 From: "Dave St.Germain" Date: Wed, 26 Feb 2014 11:45:02 -0500 Subject: [PATCH] Tweaks course update html to avoid using list tags inappropriately. LMS-1724 --- cms/djangoapps/contentstore/course_info_model.py | 4 ++-- .../contentstore/views/tests/test_course_updates.py | 2 +- common/test/acceptance/pages/lms/course_info.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cms/djangoapps/contentstore/course_info_model.py b/cms/djangoapps/contentstore/course_info_model.py index 3bdfdf2b1a..d94138b67c 100644 --- a/cms/djangoapps/contentstore/course_info_model.py +++ b/cms/djangoapps/contentstore/course_info_model.py @@ -226,8 +226,8 @@ def _get_html(course_updates_items): for update in reversed(course_updates_items): # filter course update items which have status "deleted". if update.get("status") != CourseInfoModule.STATUS_DELETED: - list_items.append(u"
  • {date}

    {content}
  • ".format(**update)) - return u"
      {list_items}
    ".format(list_items="".join(list_items)) + list_items.append(u"

    {date}

    {content}
    ".format(**update)) + return u"
    {list_items}
    ".format(list_items="".join(list_items)) def save_course_update_items(location, course_updates, course_update_items, user=None): diff --git a/cms/djangoapps/contentstore/views/tests/test_course_updates.py b/cms/djangoapps/contentstore/views/tests/test_course_updates.py index b3a85737ee..7c505f0deb 100644 --- a/cms/djangoapps/contentstore/views/tests/test_course_updates.py +++ b/cms/djangoapps/contentstore/views/tests/test_course_updates.py @@ -167,7 +167,7 @@ class CourseUpdateTest(CourseTestCase): course_updates = modulestore('direct').get_item(location) self.assertEqual(course_updates.items, [{u'date': update_date, u'content': update_content, u'id': 1}]) # course_updates 'data' field should update accordingly - update_data = u"
    1. " + update_date + "

      " + update_content + "
    " + update_data = u"

    {date}

    {content}
    ".format(date=update_date, content=update_content) self.assertEqual(course_updates.data, update_data) # test delete course update item (soft delete) diff --git a/common/test/acceptance/pages/lms/course_info.py b/common/test/acceptance/pages/lms/course_info.py index af4b0893c9..4febc77f27 100644 --- a/common/test/acceptance/pages/lms/course_info.py +++ b/common/test/acceptance/pages/lms/course_info.py @@ -20,7 +20,7 @@ class CourseInfoPage(CoursePage): """ Return the number of updates on the page. """ - return self.css_count('section.updates ol li') + return self.css_count('section.updates section article') @property def handout_links(self):