diff --git a/cms/envs/aws.py b/cms/envs/aws.py index 83df7db0ad6f068bd1219ca735e8932db419c435..2c9f313945f2d5d2e4d599e86e6543feccc7c31d 100644 --- a/cms/envs/aws.py +++ b/cms/envs/aws.py @@ -247,6 +247,7 @@ LOGGING = get_logger_config(LOG_DIR, #theming start: PLATFORM_NAME = ENV_TOKENS.get('PLATFORM_NAME', PLATFORM_NAME) +PLATFORM_DESCRIPTION = ENV_TOKENS.get('PLATFORM_DESCRIPTION', PLATFORM_DESCRIPTION) STUDIO_NAME = ENV_TOKENS.get('STUDIO_NAME', STUDIO_NAME) STUDIO_SHORT_NAME = ENV_TOKENS.get('STUDIO_SHORT_NAME', STUDIO_SHORT_NAME) diff --git a/cms/envs/common.py b/cms/envs/common.py index d697a131c707e133d589b3fcc47ebcb3ae86529f..dbf695fbf194929c92d50837be684f50f2cbbfb9 100644 --- a/cms/envs/common.py +++ b/cms/envs/common.py @@ -48,8 +48,8 @@ from datetime import timedelta import lms.envs.common # Although this module itself may not use these imported variables, other dependent modules may. from lms.envs.common import ( - USE_TZ, TECH_SUPPORT_EMAIL, PLATFORM_NAME, BUGS_EMAIL, DOC_STORE_CONFIG, DATA_DIR, ALL_LANGUAGES, WIKI_ENABLED, - update_module_store_settings, ASSET_IGNORE_REGEX, + USE_TZ, TECH_SUPPORT_EMAIL, PLATFORM_NAME, PLATFORM_DESCRIPTION, BUGS_EMAIL, DOC_STORE_CONFIG, DATA_DIR, + ALL_LANGUAGES, WIKI_ENABLED, update_module_store_settings, ASSET_IGNORE_REGEX, PARENTAL_CONSENT_AGE_LIMIT, COMPREHENSIVE_THEME_DIRS, REGISTRATION_EMAIL_PATTERNS_ALLOWED, # The following PROFILE_IMAGE_* settings are included as they are # indirectly accessed through the email opt-in API, which is diff --git a/common/djangoapps/util/tests/test_db.py b/common/djangoapps/util/tests/test_db.py index 662c5d618d76f4f508c5076030b3e233e68a9fe3..a517338cd930c7d96be34b5eddf9b65096d23bc8 100644 --- a/common/djangoapps/util/tests/test_db.py +++ b/common/djangoapps/util/tests/test_db.py @@ -236,7 +236,4 @@ class MigrationTests(TestCase): out = StringIO() call_command('makemigrations', dry_run=True, verbosity=3, stdout=out) output = out.getvalue() - # Temporary for `edx-enterprise` version bumps with migrations. - # Please delete when `edx-enterprise==0.47.0`. - if 'Remove field' not in output and 'Delete model' not in output: - self.assertIn('No changes detected', output) + self.assertIn('No changes detected', output) diff --git a/lms/envs/aws.py b/lms/envs/aws.py index bd5e4656c01bd0db57c03e672aeda2569a348bff..e4d9bf9431ecd16f2ba2ea79cb9050e7db64e599 100644 --- a/lms/envs/aws.py +++ b/lms/envs/aws.py @@ -145,6 +145,7 @@ MEDIA_ROOT = ENV_TOKENS.get('MEDIA_ROOT', MEDIA_ROOT) MEDIA_URL = ENV_TOKENS.get('MEDIA_URL', MEDIA_URL) PLATFORM_NAME = ENV_TOKENS.get('PLATFORM_NAME', PLATFORM_NAME) +PLATFORM_DESCRIPTION = ENV_TOKENS.get('PLATFORM_DESCRIPTION', PLATFORM_DESCRIPTION) # For displaying on the receipt. At Stanford PLATFORM_NAME != MERCHANT_NAME, but PLATFORM_NAME is a fine default PLATFORM_TWITTER_ACCOUNT = ENV_TOKENS.get('PLATFORM_TWITTER_ACCOUNT', PLATFORM_TWITTER_ACCOUNT) PLATFORM_FACEBOOK_ACCOUNT = ENV_TOKENS.get('PLATFORM_FACEBOOK_ACCOUNT', PLATFORM_FACEBOOK_ACCOUNT) @@ -1004,6 +1005,10 @@ ENTERPRISE_SPECIFIC_BRANDED_WELCOME_TEMPLATE = ENV_TOKENS.get( 'ENTERPRISE_SPECIFIC_BRANDED_WELCOME_TEMPLATE', ENTERPRISE_SPECIFIC_BRANDED_WELCOME_TEMPLATE ) +ENTERPRISE_TAGLINE = ENV_TOKENS.get( + 'ENTERPRISE_TAGLINE', + ENTERPRISE_TAGLINE +) ENTERPRISE_EXCLUDED_REGISTRATION_FIELDS = set( ENV_TOKENS.get( 'ENTERPRISE_EXCLUDED_REGISTRATION_FIELDS', diff --git a/lms/envs/common.py b/lms/envs/common.py index b9863b88c9e946d46355b38964001c80d71fefef..b9a8ab1af1e5a0c73b7e01a8db9df5d0a7b1fbf3 100644 --- a/lms/envs/common.py +++ b/lms/envs/common.py @@ -47,6 +47,7 @@ from lms.djangoapps.lms_xblock.mixin import LmsBlockMixin ################################### FEATURES ################################### # The display name of the platform to be used in templates/emails/etc. PLATFORM_NAME = _('Your Platform Name Here') +PLATFORM_DESCRIPTION = _('Your Platform Description Here') CC_MERCHANT_NAME = PLATFORM_NAME PLATFORM_FACEBOOK_ACCOUNT = "http://www.facebook.com/YourPlatformFacebookAccount" @@ -3271,6 +3272,7 @@ ENTERPRISE_SPECIFIC_BRANDED_WELCOME_TEMPLATE = _( '{platform_name}{end_bold} to offer you high-quality learning opportunities ' 'from the world\'s best universities.' ) +ENTERPRISE_TAGLINE = '' ENTERPRISE_EXCLUDED_REGISTRATION_FIELDS = { 'age', 'level_of_education', diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 1e559a8abbbf36e763a52e430c323b9961853f38..39c628c99290d20b00261bb93e1d3c3176cbe015 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -49,7 +49,7 @@ edx-lint==0.4.3 astroid==1.3.8 edx-django-oauth2-provider==1.2.5 edx-django-sites-extensions==2.3.0 -edx-enterprise==0.46.8 +edx-enterprise==0.48.1 edx-oauth2-provider==1.2.2 edx-opaque-keys==0.4.0 edx-organizations==0.4.6