Merge pull request #11532 from edx/rc/2016-02-16

Release Candidate rc/2016-02-16

.gitignore

@@ -66,7 +66,6 @@ django-pyfs
 .prereqs_cache
 .vagrant/
 node_modules
-.bundle/
 bin/
 
 ### Static assets pipeline artifacts

.jshintignore

@@ -2,3 +2,4 @@
 node_modules
 cms/static/js/i18n/**/*.js
 lms/static/js/i18n/**/*.js
+venv

circle.yml

@@ -10,7 +10,6 @@ general:
 dependencies:
   override:
     - npm install
-    - bundle install
 
     - pip install setuptools
     - pip install --exists-action w -r requirements/edx/paver.txt

cms/djangoapps/contentstore/views/component.py

@@ -29,6 +29,7 @@
 from student.auth import has_course_author_access
 from django.utils.translation import ugettext as _
 from models.settings.course_grading import CourseGradingModel
+from xblock_django.models import XBlockDisableConfig
 
 __all__ = [
     'container_handler',
@@ -57,7 +58,8 @@ def _advanced_component_types():
     """
     Return advanced component types which can be created.
     """
-    return [c_type for c_type in ADVANCED_COMPONENT_TYPES if c_type not in settings.DEPRECATED_ADVANCED_COMPONENT_TYPES]
+    disabled_create_block_types = XBlockDisableConfig.disabled_create_block_types()
+    return [c_type for c_type in ADVANCED_COMPONENT_TYPES if c_type not in disabled_create_block_types]
 
 
 def _load_mixed_class(category):

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

@@ -23,6 +23,7 @@
 )
 from contentstore.tests.utils import CourseTestCase
 from student.tests.factories import UserFactory
+from xblock_django.models import XBlockDisableConfig
 from xmodule.capa_module import CapaDescriptor
 from xmodule.modulestore import ModuleStoreEnum
 from xmodule.modulestore.django import modulestore
@@ -1328,6 +1329,11 @@ def setUp(self):
         super(TestComponentTemplates, self).setUp()
         self.templates = get_component_templates(self.course)
 
+        # Initialize the deprecated modules settings with empty list
+        XBlockDisableConfig.objects.create(
+            disabled_create_blocks='', enabled=True
+        )
+
     def get_templates_of_type(self, template_type):
         """
         Returns the templates for the specified type, or None if none is found.
@@ -1384,22 +1390,24 @@ def test_advanced_problems(self):
         self.assertEqual(circuit_template.get('category'), 'problem')
         self.assertEqual(circuit_template.get('boilerplate_name'), 'circuitschematic.yaml')
 
-    @patch('django.conf.settings.DEPRECATED_ADVANCED_COMPONENT_TYPES', ["poll", "survey"])
+    @patch('django.conf.settings.DEPRECATED_ADVANCED_COMPONENT_TYPES', [])
     def test_deprecated_no_advance_component_button(self):
         """
         Test that there will be no `Advanced` button on unit page if units are
         deprecated provided that they are the only modules in `Advanced Module List`
         """
+        XBlockDisableConfig.objects.create(disabled_create_blocks='poll survey', enabled=True)
         self.course.advanced_modules.extend(['poll', 'survey'])
         templates = get_component_templates(self.course)
         button_names = [template['display_name'] for template in templates]
         self.assertNotIn('Advanced', button_names)
 
-    @patch('django.conf.settings.DEPRECATED_ADVANCED_COMPONENT_TYPES', ["poll", "survey"])
+    @patch('django.conf.settings.DEPRECATED_ADVANCED_COMPONENT_TYPES', [])
     def test_cannot_create_deprecated_problems(self):
         """
         Test that we can't create problems if they are deprecated
         """
+        XBlockDisableConfig.objects.create(disabled_create_blocks='poll survey', enabled=True)
         self.course.advanced_modules.extend(['annotatable', 'poll', 'survey'])
         templates = get_component_templates(self.course)
         button_names = [template['display_name'] for template in templates]
@@ -1408,7 +1416,7 @@ def test_cannot_create_deprecated_problems(self):
         template_display_names = [template['display_name'] for template in templates[0]['templates']]
         self.assertEqual(template_display_names, ['Annotation'])
 
-    @patch('django.conf.settings.DEPRECATED_ADVANCED_COMPONENT_TYPES', [])
+    @patch('django.conf.settings.DEPRECATED_ADVANCED_COMPONENT_TYPES', ['poll'])
     def test_create_non_deprecated_problems(self):
         """
         Test that we can create problems if they are not deprecated
@@ -1417,9 +1425,9 @@ def test_create_non_deprecated_problems(self):
         templates = get_component_templates(self.course)
         button_names = [template['display_name'] for template in templates]
         self.assertIn('Advanced', button_names)
-        self.assertEqual(len(templates[0]['templates']), 3)
+        self.assertEqual(len(templates[0]['templates']), 2)
         template_display_names = [template['display_name'] for template in templates[0]['templates']]
-        self.assertEqual(template_display_names, ['Annotation', 'Poll', 'Survey'])
+        self.assertEqual(template_display_names, ['Annotation', 'Survey'])
 
 
 @ddt.ddt

cms/envs/bok_choy.env.json

@@ -76,7 +76,8 @@
         "PREVIEW_LMS_BASE": "localhost:8003",
         "ALLOW_ALL_ADVANCED_COMPONENTS": true,
         "ENABLE_CONTENT_LIBRARIES": true,
-        "ENABLE_SPECIAL_EXAMS": true
+        "ENABLE_SPECIAL_EXAMS": true,
+        "SHOW_LANGUAGE_SELECTOR": true
     },
     "FEEDBACK_SUBMISSION_EMAIL": "",
     "GITHUB_REPO_ROOT": "** OVERRIDDEN **",

cms/envs/common.py

@@ -190,6 +190,9 @@
     'ENABLE_SPECIAL_EXAMS': False,
 
     'ORGANIZATIONS_APP': False,
+
+    # Show Language selector
+    'SHOW_LANGUAGE_SELECTOR': False,
 }
 
 ENABLE_JASMINE = False
@@ -328,6 +331,9 @@
     'django.contrib.messages.middleware.MessageMiddleware',
     'track.middleware.TrackMiddleware',
 
+    # This is used to set or update the user language preferences.
+    'lang_pref.middleware.LanguagePreferenceMiddleware',
+
     # Allows us to dark-launch particular languages
     'dark_lang.middleware.DarkLangMiddleware',
 
@@ -999,11 +1005,6 @@
 ### Default language for a new course
 DEFAULT_COURSE_LANGUAGE = "en"
 
-# Adding components in this list will disable the creation of new problem for
-# those components in Studio. Existing problems will work fine and one can edit
-# them in Studio.
-DEPRECATED_ADVANCED_COMPONENT_TYPES = []
-
 # Specify XBlocks that should be treated as advanced problems. Each entry is a
 # dict:
 #       'component': the entry-point name of the XBlock.
@@ -1055,6 +1056,30 @@
     }
 }
 
+################################ XBlock Deprecation ################################
+
+# The following settings are used for deprecating XBlocks.
+
+# Adding an XBlock to this list does the following:
+# 1. Shows a warning on the course outline if the XBlock is listed in
+#    "Advanced Module List" in "Advanced Settings" page.
+# 2. List all instances of that XBlock on the top of the course outline page asking
+#    course authors to delete or replace the instances.
+DEPRECATED_BLOCK_TYPES = [
+    'peergrading',
+    'combinedopenended',
+    'graphical_slider_tool',
+]
+
+# Adding components in this list will disable the creation of new problems for
+# those advanced components in Studio. Existing problems will work fine
+# and one can edit them in Studio.
+# DEPRECATED. Please use /admin/xblock_django/xblockdisableconfig instead.
+DEPRECATED_ADVANCED_COMPONENT_TYPES = []
+
+# XBlocks can be disabled from rendering in LMS Courseware by adding them to
+# /admin/xblock_django/xblockdisableconfig/.
+
 ################################ Settings for Credit Course Requirements ################################
 # Initial delay used for retrying tasks.
 # Additional retries use longer delays.
@@ -1070,16 +1095,6 @@
 # or denied for credit.
 CREDIT_PROVIDER_TIMESTAMP_EXPIRATION = 15 * 60
 
-
-################################ Deprecated Blocks Info ################################
-
-DEPRECATED_BLOCK_TYPES = [
-    'peergrading',
-    'combinedopenended',
-    'graphical_slider_tool',
-]
-
-
 ################################ Settings for Microsites ################################
 
 ### Select an implementation for the microsite backend
@@ -1094,8 +1109,7 @@
 # TTL for microsite database template cache
 MICROSITE_DATABASE_TEMPLATE_CACHE_TTL = 5 * 60
 
-#### PROCTORING CONFIGURATION DEFAULTS
-
+############################### PROCTORING CONFIGURATION DEFAULTS ##############
 PROCTORING_BACKEND_PROVIDER = {
     'class': 'edx_proctoring.backends.null.NullBackendProvider',
     'options': {},
@@ -1111,5 +1125,12 @@
 # 5 minute expiration time for JWT id tokens issued for external API requests.
 OAUTH_ID_TOKEN_EXPIRATION = 5 * 60
 
+USERNAME_PATTERN = r'(?P<username>[\w.@+-]+)'
+
 # Partner support link for CMS footer
 PARTNER_SUPPORT_EMAIL = ''
+
+
+################################ Settings for Credentials Service ################################
+
+CREDENTIALS_SERVICE_USERNAME = 'credentials_service_user'

cms/envs/dev.py

@@ -132,7 +132,7 @@
 
 ################################ PIPELINE #################################
 
-PIPELINE_SASS_ARGUMENTS = '--debug-info --require {proj_dir}/static/sass/bourbon/lib/bourbon.rb'.format(proj_dir=PROJECT_ROOT)
+PIPELINE_SASS_ARGUMENTS = '--debug-info'
 
 ################################# CELERY ######################################
 

cms/static/cms/js/build.js

@@ -35,7 +35,6 @@
             'js/factories/asset_index',
             'js/factories/base',
             'js/factories/container',
-            'js/factories/course',
             'js/factories/course_create_rerun',
             'js/factories/course_info',
             'js/factories/edit_tabs',

cms/static/cms/js/require-config.js

@@ -87,6 +87,7 @@
             "ova": 'js/vendor/ova/ova',
             "catch": 'js/vendor/ova/catch/js/catch',
             "handlebars": 'js/vendor/ova/catch/js/handlebars-1.1.2',
+            "lang_edx": "js/src/lang_edx",
             // end of Annotation tool files
 
             // externally hosted files
@@ -196,6 +197,9 @@
             "tinymce": {
                 exports: "tinymce"
             },
+            "lang_edx": {
+                deps: ["jquery"]
+            },
             "mathjax": {
                 exports: "MathJax",
                 init: function() {

cms/static/js/factories/base.js

@@ -1,2 +1,2 @@
 define(['js/base', 'coffee/src/main', 'js/src/logger', 'datepair', 'accessibility',
-'ieshim', 'tooltip_manager']);
+'ieshim', 'tooltip_manager', 'lang_edx', 'js/models/course']);