diff --git a/cms/envs/aws.py b/cms/envs/aws.py index 855543d463cff2c166b5986a847341e3be2c02bc..999a05c0263b08f52f1bfc270c2cf4213f2c0825 100644 --- a/cms/envs/aws.py +++ b/cms/envs/aws.py @@ -503,7 +503,7 @@ JWT_AUTH.update(ENV_TOKENS.get('JWT_AUTH', {})) ######################## CUSTOM COURSES for EDX CONNECTOR ###################### if FEATURES.get('CUSTOM_COURSES_EDX'): - INSTALLED_APPS.append('openedx.core.djangoapps.ccxcon') + INSTALLED_APPS.append('openedx.core.djangoapps.ccxcon.apps.CCXConnectorConfig') # Partner support link for CMS footer PARTNER_SUPPORT_EMAIL = ENV_TOKENS.get('PARTNER_SUPPORT_EMAIL', PARTNER_SUPPORT_EMAIL) diff --git a/cms/envs/test.py b/cms/envs/test.py index 86e4312906d09e7e6caba5bed23f7612e1cd7c4c..f62082330393a48a4c8abdca79eda3539fbe01af 100644 --- a/cms/envs/test.py +++ b/cms/envs/test.py @@ -331,7 +331,7 @@ FEATURES['ENABLE_TEAMS'] = True SECRET_KEY = '85920908f28904ed733fe576320db18cabd7b6cd' ######### custom courses ######### -INSTALLED_APPS.append('openedx.core.djangoapps.ccxcon') +INSTALLED_APPS.append('openedx.core.djangoapps.ccxcon.apps.CCXConnectorConfig') FEATURES['CUSTOM_COURSES_EDX'] = True # API access management -- needed for simple-history to run. diff --git a/cms/envs/yaml_config.py b/cms/envs/yaml_config.py index 1def36ef0666b971be65583afe4a590cbacf8f62..b8861d32acd85c384dc26e76a3d910463043abae 100644 --- a/cms/envs/yaml_config.py +++ b/cms/envs/yaml_config.py @@ -259,7 +259,7 @@ BROKER_USE_SSL = ENV_TOKENS.get('CELERY_BROKER_USE_SSL', False) ######################## CUSTOM COURSES for EDX CONNECTOR ###################### if FEATURES.get('CUSTOM_COURSES_EDX'): - INSTALLED_APPS.append('openedx.core.djangoapps.ccxcon') + INSTALLED_APPS.append('openedx.core.djangoapps.ccxcon.apps.CCXConnectorConfig') ########################## Extra middleware classes ####################### diff --git a/lms/envs/aws.py b/lms/envs/aws.py index 7be1753a7c5e53484458a5fbab35358981ac38c2..e9e61a4db36aa8665b8958d6f19bb1660e337a15 100644 --- a/lms/envs/aws.py +++ b/lms/envs/aws.py @@ -823,7 +823,7 @@ ECOMMERCE_SERVICE_WORKER_USERNAME = ENV_TOKENS.get( ##### Custom Courses for EdX ##### if FEATURES.get('CUSTOM_COURSES_EDX'): - INSTALLED_APPS += ['lms.djangoapps.ccx', 'openedx.core.djangoapps.ccxcon'] + INSTALLED_APPS += ['lms.djangoapps.ccx', 'openedx.core.djangoapps.ccxcon.apps.CCXConnectorConfig'] MODULESTORE_FIELD_OVERRIDE_PROVIDERS += ( 'lms.djangoapps.ccx.overrides.CustomCoursesForEdxOverrideProvider', ) diff --git a/lms/envs/test.py b/lms/envs/test.py index d683b05c47821b8b70dee3e2099b1c59264709a3..a86d17259020e2ba304db2cd7652fd4c6bbdf60a 100644 --- a/lms/envs/test.py +++ b/lms/envs/test.py @@ -552,7 +552,7 @@ FACEBOOK_APP_ID = "Test" FACEBOOK_API_VERSION = "v2.8" ######### custom courses ######### -INSTALLED_APPS += ['lms.djangoapps.ccx', 'openedx.core.djangoapps.ccxcon'] +INSTALLED_APPS += ['lms.djangoapps.ccx', 'openedx.core.djangoapps.ccxcon.apps.CCXConnectorConfig'] FEATURES['CUSTOM_COURSES_EDX'] = True # Set dummy values for profile image settings. diff --git a/lms/envs/yaml_config.py b/lms/envs/yaml_config.py index 83ed8b56b75b12e93fc833a1cb06b8afc66e19ae..1bfc0df5f63492f1ab852c715cee64b89e687b6e 100644 --- a/lms/envs/yaml_config.py +++ b/lms/envs/yaml_config.py @@ -306,7 +306,7 @@ GRADES_DOWNLOAD_ROUTING_KEY = HIGH_MEM_QUEUE ##### Custom Courses for EdX ##### if FEATURES.get('CUSTOM_COURSES_EDX'): - INSTALLED_APPS += ['lms.djangoapps.ccx', 'openedx.core.djangoapps.ccxcon'] + INSTALLED_APPS += ['lms.djangoapps.ccx', 'openedx.core.djangoapps.ccxcon.apps.CCXConnectorConfig'] MODULESTORE_FIELD_OVERRIDE_PROVIDERS += ( 'lms.djangoapps.ccx.overrides.CustomCoursesForEdxOverrideProvider', ) diff --git a/openedx/core/djangoapps/ccxcon/__init__.py b/openedx/core/djangoapps/ccxcon/__init__.py index 9a97524877a0235d6ed425199c24ccf98d892647..98a839e4691d8b6694879c3d9b053247c62efe4a 100644 --- a/openedx/core/djangoapps/ccxcon/__init__.py +++ b/openedx/core/djangoapps/ccxcon/__init__.py @@ -6,5 +6,3 @@ that is used to interact with the CCX and their master courses. The ccxcon app needs to be placed in `openedx.core.djangoapps` because it will be used both in CMS and LMS. """ - -default_app_config = 'openedx.core.djangoapps.ccxcon.apps.CCXConnectorConfig'