Introduce constants for studio_view, student_view, and author_view.

cms/djangoapps/contentstore/views/item.py

@@ -23,6 +23,7 @@ import xmodule
 from xmodule.modulestore.django import modulestore
 from xmodule.modulestore.exceptions import ItemNotFoundError, InvalidLocationError, DuplicateItemError
 from xmodule.modulestore.inheritance import own_metadata
+from xmodule.x_module import PREVIEW_VIEWS, STUDIO_VIEW
 
 from util.json_request import expect_json, JsonResponse
 from util.string_utils import str_to_bool
@@ -180,15 +181,15 @@ def xblock_view_handler(request, usage_key_string, view_name):
         xblock = store.get_item(usage_key)
         is_read_only = _is_xblock_read_only(xblock)
         container_views = ['container_preview', 'reorderable_container_child_preview']
-        unit_views = ['student_view', 'author_view']
+        unit_views = PREVIEW_VIEWS
 
         # wrap the generated fragment in the xmodule_editor div so that the javascript
         # can bind to it correctly
         xblock.runtime.wrappers.append(partial(wrap_xblock, 'StudioRuntime', usage_id_serializer=unicode))
 
-        if view_name == 'studio_view':
+        if view_name == STUDIO_VIEW:
             try:
-                fragment = xblock.render('studio_view')
+                fragment = xblock.render(STUDIO_VIEW)
             # catch exceptions indiscriminately, since after this point they escape the
             # dungeon and surface as uneditable, unsaveable, and undeletable
             # component-goblins.

cms/djangoapps/contentstore/views/preview.py

@@ -10,6 +10,7 @@ from django.contrib.auth.decorators import login_required
 from edxmako.shortcuts import render_to_string
 
 from xmodule_modifiers import replace_static_urls, wrap_xblock, wrap_fragment
+from xmodule.x_module import PREVIEW_VIEWS, STUDENT_VIEW, AUTHOR_VIEW
 from xmodule.error_module import ErrorDescriptor
 from xmodule.exceptions import NotFoundError, ProcessingError
 from xmodule.modulestore.django import modulestore, ModuleI18nService
@@ -175,7 +176,7 @@ def _studio_wrap_xblock(xblock, view, frag, context, display_name_only=False):
     Wraps the results of rendering an XBlock view in a div which adds a header and Studio action buttons.
     """
     # Only add the Studio wrapper when on the container page. The unit page will remain as is for now.
-    if context.get('container_view', None) and view in ['student_view', 'author_view']:
+    if context.get('container_view', None) and view in PREVIEW_VIEWS:
         root_xblock = context.get('root_xblock')
         is_root = root_xblock and xblock.location == root_xblock.location
         is_reorderable = _is_xblock_reorderable(xblock, context)
@@ -198,7 +199,7 @@ def get_preview_fragment(request, descriptor, context):
     """
     module = _load_preview_module(request, descriptor)
 
-    preview_view = 'author_view' if _has_author_view(module) else 'student_view'
+    preview_view = AUTHOR_VIEW if _has_author_view(module) else STUDENT_VIEW
 
     try:
         fragment = module.render(preview_view, context)

cms/djangoapps/contentstore/views/tests/test_item.py

@@ -22,6 +22,7 @@ from student.tests.factories import UserFactory
 from xmodule.capa_module import CapaDescriptor
 from xmodule.modulestore.django import modulestore
 from xmodule.modulestore.exceptions import ItemNotFoundError
+from xmodule.x_module import STUDIO_VIEW, STUDENT_VIEW
 from opaque_keys.edx.keys import UsageKey
 from opaque_keys.edx.locations import Location
 from xmodule.partitions.partitions import Group, UserPartition
@@ -712,12 +713,12 @@ class TestEditItem(ItemTest):
         self.assertNotEqual(draft.data, published.data)
 
         # Get problem by 'xblock_handler'
-        view_url = reverse_usage_url("xblock_view_handler", self.problem_usage_key, {"view_name": "student_view"})
+        view_url = reverse_usage_url("xblock_view_handler", self.problem_usage_key, {"view_name": STUDENT_VIEW})
         resp = self.client.get(view_url, HTTP_ACCEPT='application/json')
         self.assertEqual(resp.status_code, 200)
 
         # Activate the editing view
-        view_url = reverse_usage_url("xblock_view_handler", self.problem_usage_key, {"view_name": "studio_view"})
+        view_url = reverse_usage_url("xblock_view_handler", self.problem_usage_key, {"view_name": STUDIO_VIEW})
         resp = self.client.get(view_url, HTTP_ACCEPT='application/json')
         self.assertEqual(resp.status_code, 200)
 

cms/djangoapps/contentstore/views/tests/test_tabs.py

@@ -4,7 +4,7 @@ import json
 from contentstore.views import tabs
 from contentstore.tests.utils import CourseTestCase
 from django.test import TestCase
-from xmodule.modulestore.django import loc_mapper
+from xmodule.x_module import STUDENT_VIEW
 from xmodule.modulestore.tests.factories import CourseFactory, ItemFactory
 from xmodule.tabs import CourseTabList, WikiTab
 from contentstore.utils import reverse_course_url
@@ -178,7 +178,7 @@ class TabsPageTests(CourseTestCase):
         """
         Verify that the static tab renders itself with the correct HTML
         """
-        preview_url = '/xblock/{}/student_view'.format(self.test_tab.location)
+        preview_url = '/xblock/{}/{}'.format(self.test_tab.location, STUDENT_VIEW)
 
         resp = self.client.get(preview_url, HTTP_ACCEPT='application/json')
         self.assertEqual(resp.status_code, 200)

cms/djangoapps/contentstore/views/tests/test_unit_page.py

@@ -5,6 +5,7 @@ Unit tests for the unit page.
 from contentstore.views.tests.utils import StudioPageTestCase
 from xmodule.modulestore.django import modulestore
 from xmodule.modulestore.tests.factories import ItemFactory
+from xmodule.x_module import STUDENT_VIEW
 
 
 class UnitPageTestCase(StudioPageTestCase):
@@ -38,7 +39,7 @@ class UnitPageTestCase(StudioPageTestCase):
         """
         Verify that a public xblock's preview returns the expected HTML.
         """
-        self.validate_preview_html(self.video, 'student_view',
+        self.validate_preview_html(self.video, STUDENT_VIEW,
                                    can_edit=True, can_reorder=True, can_add=False)
 
     def test_draft_component_preview_html(self):
@@ -47,7 +48,7 @@ class UnitPageTestCase(StudioPageTestCase):
         """
         modulestore('draft').convert_to_draft(self.vertical.location)
         draft_video = modulestore('draft').convert_to_draft(self.video.location)
-        self.validate_preview_html(draft_video, 'student_view',
+        self.validate_preview_html(draft_video, STUDENT_VIEW,
                                    can_edit=True, can_reorder=True, can_add=False)
 
     def test_public_child_container_preview_html(self):
@@ -59,7 +60,7 @@ class UnitPageTestCase(StudioPageTestCase):
                                              category='split_test', display_name='Split Test')
         ItemFactory.create(parent_location=child_container.location,
                            category='html', display_name='grandchild')
-        self.validate_preview_html(child_container, 'student_view',
+        self.validate_preview_html(child_container, STUDENT_VIEW,
                                    can_reorder=True, can_edit=True, can_add=False)
 
     def test_draft_child_container_preview_html(self):
@@ -73,5 +74,5 @@ class UnitPageTestCase(StudioPageTestCase):
                            category='html', display_name='grandchild')
         modulestore('draft').convert_to_draft(self.vertical.location)
         draft_child_container = modulestore('draft').get_item(child_container.location)
-        self.validate_preview_html(draft_child_container, 'student_view',
+        self.validate_preview_html(draft_child_container, STUDENT_VIEW,
                                    can_reorder=True, can_edit=True, can_add=False)