From 3ae87dd9d73e5c58913ed2b78eef0ff848b43364 Mon Sep 17 00:00:00 2001 From: Nimisha Asthagiri Date: Fri, 17 Nov 2017 14:53:52 -0500 Subject: [PATCH] Update Studio API to include highlights_enabled_for_messaging --- cms/djangoapps/contentstore/views/item.py | 3 ++- cms/djangoapps/contentstore/views/tests/test_item.py | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/cms/djangoapps/contentstore/views/item.py b/cms/djangoapps/contentstore/views/item.py index bff4d8b946..fd09287b22 100644 --- a/cms/djangoapps/contentstore/views/item.py +++ b/cms/djangoapps/contentstore/views/item.py @@ -1190,8 +1190,9 @@ def create_xblock_info(xblock, data=None, metadata=None, include_ancestor_info=F }) elif xblock.category == 'chapter': xblock_info.update({ - 'highlights': getattr(xblock, 'highlights', []), + 'highlights': xblock.highlights, 'highlights_enabled': highlights_setting.is_enabled(), + 'highlights_enabled_for_messaging': course.highlights_enabled_for_messaging, 'highlights_preview_only': not COURSE_UPDATE_WAFFLE_FLAG.is_enabled(course.id), 'highlights_doc_url': HelpUrlExpert.the_one().url_for_token('content_highlights'), }) diff --git a/cms/djangoapps/contentstore/views/tests/test_item.py b/cms/djangoapps/contentstore/views/tests/test_item.py index 09f7e6f7c0..5dd760fed6 100644 --- a/cms/djangoapps/contentstore/views/tests/test_item.py +++ b/cms/djangoapps/contentstore/views/tests/test_item.py @@ -2573,7 +2573,9 @@ class TestXBlockInfo(ItemTest): self.assertEqual(xblock_info['start'], DEFAULT_START_DATE.strftime('%Y-%m-%dT%H:%M:%SZ')) def test_highlights_enabled(self): - chapter = modulestore().get_item(self.chapter.location) + self.course.highlights_enabled_for_messaging = True + self.store.update_item(self.course, None) + chapter = self.store.get_item(self.chapter.location) with highlights_setting.override(): xblock_info = create_xblock_info(chapter) self.assertTrue(xblock_info['highlights_enabled']) @@ -2606,6 +2608,7 @@ class TestXBlockInfo(ItemTest): self.assertEqual(xblock_info['format'], None) self.assertEqual(xblock_info['highlights'], self.chapter.highlights) self.assertFalse(xblock_info['highlights_enabled']) + self.assertFalse(xblock_info['highlights_enabled_for_messaging']) # Finally, validate the entire response for consistency self.validate_xblock_info_consistency(xblock_info, has_child_info=has_child_info)