Rename values in SiteConfiguration/History (2/3)

.coveragerc

@@ -30,6 +30,7 @@ omit =
 
 concurrency=multiprocessing
 parallel = true
+relative_files = true
 
 [report]
 ignore_errors = True

Makefile

@@ -24,7 +24,7 @@ SWAGGER = docs/swagger.yaml
 docs: api-docs guides ## build all the developer documentation for this repository
 
 swagger: ## generate the swagger.yaml file
-	DJANGO_SETTINGS_MODULE=docs.docs_settings python manage.py lms generate_swagger --generator-class=openedx.core.apidocs.ApiSchemaGenerator -o $(SWAGGER)
+	DJANGO_SETTINGS_MODULE=docs.docs_settings python manage.py lms generate_swagger --generator-class=edx_api_doc_tools.ApiSchemaGenerator -o $(SWAGGER)
 
 api-docs-sphinx: swagger	## generate the sphinx source files for api-docs
 	rm -f docs/api/gen/*
@@ -52,6 +52,7 @@ pull_translations: ## pull translations from Transifex
 	git clean -fdX conf/locale/eo
 	i18n_tool validate
 
+
 detect_changed_source_translations: ## check if translation files are up-to-date
 	i18n_tool changed
 
@@ -90,7 +91,7 @@ upgrade: ## update the pip requirements files to use the latest releases satisfy
 	done
 	# Post process all of the files generated above to work around open pip-tools issues
 	scripts/post-pip-compile.sh $(REQ_FILES:=.txt)
-	# Let tox control the Django version for tests
-	grep "^django==" requirements/edx/base.txt > requirements/edx/django.txt
-	sed '/^[dD]jango==/d' requirements/edx/testing.txt > requirements/edx/testing.tmp
+	# Let tox control the Django version & django-oauth-toolkit version for tests
+	grep -e "^django==" -e "^django-oauth-toolkit==" requirements/edx/base.txt > requirements/edx/django.txt
+	sed '/^[dD]jango==/d;/^django-oauth-toolkit==/d' requirements/edx/testing.txt > requirements/edx/testing.tmp
 	mv requirements/edx/testing.tmp requirements/edx/testing.txt

cms/conftest.py

@@ -9,11 +9,11 @@
 
 import importlib
 import os
+import logging
 import contracts
 import pytest
 
-from openedx.core.pytest_hooks import pytest_json_modifyreport  # pylint: disable=unused-import
-from openedx.core.pytest_hooks import pytest_sessionfinish  # pylint: disable=unused-import
+from openedx.core.pytest_hooks import DeferPlugin
 
 
 # Patch the xml libs before anything else.
@@ -25,6 +25,11 @@ def pytest_configure(config):
     """
     Do core setup operations from manage.py before collecting tests.
     """
+    if config.pluginmanager.hasplugin("pytest_jsonreport") or config.pluginmanager.hasplugin("json-report"):
+        config.pluginmanager.register(DeferPlugin())
+    else:
+        logging.info("pytest did not register json_report correctly")
+
     if config.getoption('help'):
         return
     enable_contracts = os.environ.get('ENABLE_CONTRACTS', False)

cms/djangoapps/api/v1/urls.py

@@ -10,5 +10,5 @@
 app_name = 'cms.djangoapps.api.v1'
 
 router = DefaultRouter()
-router.register(r'course_runs', CourseRunViewSet, base_name='course_run')
+router.register(r'course_runs', CourseRunViewSet, basename='course_run')
 urlpatterns = router.urls

cms/djangoapps/api/v1/views/course_runs.py

@@ -7,7 +7,7 @@
 from opaque_keys.edx.keys import CourseKey
 from rest_framework import parsers, permissions, status, viewsets
 from rest_framework.authentication import SessionAuthentication
-from rest_framework.decorators import detail_route
+from rest_framework.decorators import action
 from rest_framework.response import Response
 
 from contentstore.views.course import _accessible_courses_iter, get_course_and_check_access
@@ -74,7 +74,8 @@ def create(self, request, *args, **kwargs):
         serializer.save()
         return Response(serializer.data, status=status.HTTP_201_CREATED)
 
-    @detail_route(
+    @action(
+        detail=True,
         methods=['post', 'put'],
         parser_classes=(parsers.FormParser, parsers.MultiPartParser,),
         serializer_class=CourseRunImageSerializer)
@@ -85,7 +86,7 @@ def images(self, request, *args, **kwargs):
         serializer.save()
         return Response(serializer.data)
 
-    @detail_route(methods=['post'])
+    @action(detail=True, methods=['post'])
     def rerun(self, request, *args, **kwargs):
         course_run = self.get_object()
         serializer = CourseRunRerunSerializer(course_run, data=request.data, context=self.get_serializer_context())

cms/djangoapps/contentstore/tasks.py

@@ -528,7 +528,7 @@ def _parse_time(time_isoformat):
     ).replace(tzinfo=UTC)
 
 
-@task()
+@task(routing_key=settings.UPDATE_SEARCH_INDEX_JOB_QUEUE)
 def update_search_index(course_id, triggered_time_isoformat):
     """ Updates course search index. """
     try:

cms/djangoapps/contentstore/tests/test_course_settings.py

@@ -91,6 +91,33 @@ def test_ooc_encoder(self):
         self.assertEqual(jsondetails['string'], 'string')
 
 
+class CourseAdvanceSettingViewTest(CourseTestCase, MilestonesTestCaseMixin):
+    """
+    Tests for AdvanceSettings View.
+    """
+
+    def setUp(self):
+        super(CourseAdvanceSettingViewTest, self).setUp()
+        self.fullcourse = CourseFactory.create()
+        self.course_setting_url = get_url(self.course.id, 'advanced_settings_handler')
+
+    @override_settings(FEATURES={'DISABLE_MOBILE_COURSE_AVAILABLE': True})
+    def test_mobile_field_available(self):
+
+        """
+        Test to check `Mobile Course Available` field is not viewable in Studio
+        when DISABLE_MOBILE_COURSE_AVAILABLE is true.
+        """
+
+        response = self.client.get_html(self.course_setting_url)
+        start = response.content.decode('utf-8').find("mobile_available")
+        end = response.content.decode('utf-8').find("}", start)
+        settings_fields = json.loads(response.content.decode('utf-8')[start + len("mobile_available: "):end + 1])
+
+        self.assertEqual(settings_fields["display_name"], "Mobile Course Available")
+        self.assertEqual(settings_fields["deprecated"], True)
+
+
 @ddt.ddt
 class CourseDetailsViewTest(CourseTestCase, MilestonesTestCaseMixin):
     """

cms/djangoapps/contentstore/tests/test_request_event.py

@@ -1,10 +1,9 @@
 """Tests for CMS's requests to logs"""
 
 
-import mock
 from django.test import TestCase
 from django.urls import reverse
-from six import unichr  # pylint: disable=W0622
+from six import unichr
 
 from contentstore.views.helpers import event as cms_user_track
 
@@ -21,12 +20,11 @@ def test_post_answers_to_log(self):
         """
         requests = [
             {"event": "my_event", "event_type": "my_event_type", "page": "my_page"},
-            {"event": "{'json': 'object'}", "event_type": unichr(512), "page": "my_page"}  # pylint: disable=unicode-format-string
+            {"event": "{'json': 'object'}", "event_type": unichr(512), "page": "my_page"}
         ]
-        with mock.patch.dict('django.conf.settings.FEATURES', {'ENABLE_SQL_TRACKING_LOGS': True}):
-            for request_params in requests:
-                response = self.client.post(reverse(cms_user_track), request_params)
-                self.assertEqual(response.status_code, 204)
+        for request_params in requests:
+            response = self.client.post(reverse(cms_user_track), request_params)
+            self.assertEqual(response.status_code, 204)
 
     def test_get_answers_to_log(self):
         """
@@ -35,9 +33,8 @@ def test_get_answers_to_log(self):
         """
         requests = [
             {"event": "my_event", "event_type": "my_event_type", "page": "my_page"},
-            {"event": "{'json': 'object'}", "event_type": unichr(512), "page": "my_page"}  # pylint: disable=unicode-format-string
+            {"event": "{'json': 'object'}", "event_type": unichr(512), "page": "my_page"}
         ]
-        with mock.patch.dict('django.conf.settings.FEATURES', {'ENABLE_SQL_TRACKING_LOGS': True}):
-            for request_params in requests:
-                response = self.client.get(reverse(cms_user_track), request_params)
-                self.assertEqual(response.status_code, 204)
+        for request_params in requests:
+            response = self.client.get(reverse(cms_user_track), request_params)
+            self.assertEqual(response.status_code, 204)

cms/djangoapps/contentstore/views/course.py

@@ -103,6 +103,7 @@
 
 log = logging.getLogger(__name__)
 
+
 __all__ = ['course_info_handler', 'course_handler', 'course_listing',
            'course_info_update_handler', 'course_search_index_handler',
            'course_rerun_handler',
@@ -1312,6 +1313,11 @@ def advanced_settings_handler(request, course_key_string):
     course_key = CourseKey.from_string(course_key_string)
     with modulestore().bulk_operations(course_key):
         course_module = get_course_and_check_access(course_key, request.user)
+
+        advanced_dict = CourseMetadata.fetch(course_module)
+        if settings.FEATURES.get('DISABLE_MOBILE_COURSE_AVAILABLE', False):
+            advanced_dict.get('mobile_available')['deprecated'] = True
+
         if 'text/html' in request.META.get('HTTP_ACCEPT', '') and request.method == 'GET':
             publisher_enabled = configuration_helpers.get_value_for_org(
                 course_module.location.org,
@@ -1321,7 +1327,7 @@ def advanced_settings_handler(request, course_key_string):
 
             return render_to_response('settings_advanced.html', {
                 'context_course': course_module,
-                'advanced_dict': CourseMetadata.fetch(course_module),
+                'advanced_dict': advanced_dict,
                 'advanced_settings_url': reverse_course_url('advanced_settings_handler', course_key),
                 'publisher_enabled': publisher_enabled,
 

cms/djangoapps/contentstore/views/transcripts_ajax.py

@@ -264,7 +264,7 @@ def download_transcripts(request):
 
     # Construct an HTTP response
     response = HttpResponse(content, content_type=mimetype)
-    response['Content-Disposition'] = u'attachment; filename="{filename}"'.format(filename=filename.encode('utf-8'))
+    response['Content-Disposition'] = u'attachment; filename="{filename}"'.format(filename=filename)
     return response
 
 

cms/envs/common.py

@@ -53,7 +53,7 @@
     # indirectly accessed through the email opt-in API, which is
     # technically accessible through the CMS via legacy URLs.
     PROFILE_IMAGE_BACKEND, PROFILE_IMAGE_DEFAULT_FILENAME, PROFILE_IMAGE_DEFAULT_FILE_EXTENSION,
-    PROFILE_IMAGE_SECRET_KEY, PROFILE_IMAGE_MIN_BYTES, PROFILE_IMAGE_MAX_BYTES, PROFILE_IMAGE_SIZES_MAP,
+    PROFILE_IMAGE_HASH_SEED, PROFILE_IMAGE_MIN_BYTES, PROFILE_IMAGE_MAX_BYTES, PROFILE_IMAGE_SIZES_MAP,
     # The following setting is included as it is used to check whether to
     # display credit eligibility table on the CMS or not.
     COURSE_MODE_DEFAULTS, DEFAULT_COURSE_ABOUT_IMAGE_URL,
@@ -103,6 +103,9 @@
 
     GENERATE_PROFILE_SCORES,
 
+    # Enterprise service settings
+    ENTERPRISE_CATALOG_INTERNAL_ROOT_URL,
+
     # Methods to derive settings
     _make_mako_template_dirs,
     _make_locale_paths,
@@ -325,6 +328,20 @@
     'ENABLE_READING_FROM_MULTIPLE_HISTORY_TABLES': True,
     'SHOW_FOOTER_LANGUAGE_SELECTOR': False,
     'ENABLE_ENROLLMENT_RESET': False,
+    'DISABLE_MOBILE_COURSE_AVAILABLE': False,
+
+    # .. toggle_name: ENABLE_CHANGE_USER_PASSWORD_ADMIN
+    # .. toggle_implementation: DjangoSetting
+    # .. toggle_default: False
+    # .. toggle_description: Set to True to enable changing a user password through django admin. This is disabled by default because enabling allows a method to bypass password policy.
+    # .. toggle_category: admin
+    # .. toggle_use_cases: open_edx
+    # .. toggle_creation_date: 2020-02-21
+    # .. toggle_expiration_date: None
+    # .. toggle_tickets: 'https://github.com/edx/edx-platform/pull/21616'
+    # .. toggle_status: supported
+    # .. toggle_warnings: None
+    'ENABLE_CHANGE_USER_PASSWORD_ADMIN': False,
 }
 
 ENABLE_JASMINE = False
@@ -563,7 +580,7 @@
 
 ################################# Middleware ###################################
 
-MIDDLEWARE_CLASSES = [
+MIDDLEWARE = [
     'openedx.core.lib.x_forwarded_for.middleware.XForwardedForMiddleware',
 
     'crum.CurrentRequestUserMiddleware',
@@ -694,7 +711,7 @@
     # https://api.mongodb.com/python/2.9.1/api/pymongo/mongo_client.html#module-pymongo.mongo_client
     # default is never timeout while the connection is open,
     #this means it needs to explicitly close raising pymongo.errors.NetworkTimeout
-    'socketTimeoutMS': 3000,
+    'socketTimeoutMS': 6000,
     'connectTimeoutMS': 2000,  # default is 20000, I believe raises pymongo.errors.ConnectionFailure
     # Not setting waitQueueTimeoutMS and waitQueueMultiple since pymongo defaults to nobody being allowed to wait
     'auth_source': None,
@@ -834,7 +851,7 @@
 DEBUG = False
 SESSION_COOKIE_SECURE = False
 SESSION_SAVE_EVERY_REQUEST = False
-SESSION_SERIALIZER = 'openedx.core.lib.session_serializers.PickleV2Serializer'
+SESSION_SERIALIZER = 'openedx.core.lib.session_serializers.PickleSerializer'
 SESSION_COOKIE_DOMAIN = ""
 SESSION_COOKIE_NAME = 'sessionid'
 
@@ -1352,7 +1369,6 @@
     # other apps that are.  Django 1.8 wants to have imported models supported
     # by installed apps.
     'openedx.core.djangoapps.oauth_dispatch.apps.OAuthDispatchAppConfig',
-    'oauth_provider',
     'lms.djangoapps.courseware',
     'coursewarehistoryextended',
     'survey.apps.SurveyConfig',
@@ -1414,6 +1430,9 @@
 
     # so sample_task is available to celery workers
     'openedx.core.djangoapps.heartbeat',
+
+    # signal handlers to capture course dates into edx-when
+    'openedx.core.djangoapps.course_date_signals',
 ]
 
 
@@ -1902,6 +1921,9 @@
 ########## Settings youtube thumbnails scraper tasks ############
 SCRAPE_YOUTUBE_THUMBNAILS_JOB_QUEUE = DEFAULT_PRIORITY_QUEUE
 
+########## Settings update search index task ############
+UPDATE_SEARCH_INDEX_JOB_QUEUE = DEFAULT_PRIORITY_QUEUE
+
 ###################### VIDEO IMAGE STORAGE ######################
 
 VIDEO_IMAGE_DEFAULT_FILENAME = 'images/video-images/default_video_image.png'

cms/envs/devstack.py

@@ -72,7 +72,7 @@
 
 INSTALLED_APPS += ['debug_toolbar']
 
-MIDDLEWARE_CLASSES.append('debug_toolbar.middleware.DebugToolbarMiddleware')
+MIDDLEWARE.append('debug_toolbar.middleware.DebugToolbarMiddleware')
 INTERNAL_IPS = ('127.0.0.1',)
 
 DEBUG_TOOLBAR_PANELS = (

cms/envs/production.py

@@ -574,6 +574,9 @@ def get_env_setting(setting):
 ########## Settings youtube thumbnails scraper tasks ############
 SCRAPE_YOUTUBE_THUMBNAILS_JOB_QUEUE = ENV_TOKENS.get('SCRAPE_YOUTUBE_THUMBNAILS_JOB_QUEUE', DEFAULT_PRIORITY_QUEUE)
 
+########## Settings update search index task ############
+UPDATE_SEARCH_INDEX_JOB_QUEUE = ENV_TOKENS.get('UPDATE_SEARCH_INDEX_JOB_QUEUE', DEFAULT_PRIORITY_QUEUE)
+
 ########################## Parental controls config  #######################
 
 # The age at which a learner no longer requires parental consent, or None
@@ -586,7 +589,7 @@ def get_env_setting(setting):
 ########################## Extra middleware classes  #######################
 
 # Allow extra middleware classes to be added to the app through configuration.
-MIDDLEWARE_CLASSES.extend(ENV_TOKENS.get('EXTRA_MIDDLEWARE_CLASSES', []))
+MIDDLEWARE.extend(ENV_TOKENS.get('EXTRA_MIDDLEWARE_CLASSES', []))
 
 ########################## Settings for Completion API #####################
 
@@ -607,6 +610,10 @@ def get_env_setting(setting):
     'ENTERPRISE_CUSTOMER_CATALOG_DEFAULT_CONTENT_FILTER',
     ENTERPRISE_CUSTOMER_CATALOG_DEFAULT_CONTENT_FILTER
 )
+ENTERPRISE_CATALOG_INTERNAL_ROOT_URL = ENV_TOKENS.get(
+    'ENTERPRISE_CATALOG_INTERNAL_ROOT_URL',
+    ENTERPRISE_CATALOG_INTERNAL_ROOT_URL
+)
 
 # This limits the type of roles that are submittable via the `student` app's manual enrollment
 # audit API. While this isn't used in CMS, it is used via Enterprise which is installed in