From ce769b363dd77e4780cb929be3443569db12ddd6 Mon Sep 17 00:00:00 2001 From: Peter Fogg Date: Tue, 2 Feb 2016 15:17:50 -0500 Subject: [PATCH] Convert PARTNER_SUPPORT_EMAIL to a setting. --- cms/envs/aws.py | 3 +++ cms/envs/bok_choy.py | 2 +- cms/envs/common.py | 3 +++ cms/templates/widgets/sock.html | 4 ++-- themes/edx.org/cms/templates/widgets/sock.html | 4 ++-- 5 files changed, 11 insertions(+), 5 deletions(-) diff --git a/cms/envs/aws.py b/cms/envs/aws.py index 20dd19e797..0139c70062 100644 --- a/cms/envs/aws.py +++ b/cms/envs/aws.py @@ -387,3 +387,6 @@ OAUTH_OIDC_ISSUER = ENV_TOKENS['OAUTH_OIDC_ISSUER'] ######################## CUSTOM COURSES for EDX CONNECTOR ###################### if FEATURES.get('CUSTOM_COURSES_EDX'): INSTALLED_APPS += ('openedx.core.djangoapps.ccxcon',) + +# Partner support link for CMS footer +PARTNER_SUPPORT_EMAIL = ENV_TOKENS.get('PARTNER_SUPPORT_EMAIL', PARTNER_SUPPORT_EMAIL) diff --git a/cms/envs/bok_choy.py b/cms/envs/bok_choy.py index 2256d45f75..15bd0dee05 100644 --- a/cms/envs/bok_choy.py +++ b/cms/envs/bok_choy.py @@ -94,7 +94,7 @@ FEATURES['ENABLE_MOBILE_REST_API'] = True # Enable video bumper in Studio FEATURES['ENABLE_VIDEO_BUMPER'] = True # Enable video bumper in Studio settings # Enable partner support link in Studio footer -FEATURES['PARTNER_SUPPORT_EMAIL'] = 'partner-support@example.com' +PARTNER_SUPPORT_EMAIL = 'partner-support@example.com' # Disable some block types to test block deprecation logic DEPRECATED_BLOCK_TYPES = ['poll', 'survey'] diff --git a/cms/envs/common.py b/cms/envs/common.py index 36f40393fa..bf7acb0101 100644 --- a/cms/envs/common.py +++ b/cms/envs/common.py @@ -1110,3 +1110,6 @@ OAUTH_OIDC_ISSUER = 'https://www.example.com/oauth2' # 5 minute expiration time for JWT id tokens issued for external API requests. OAUTH_ID_TOKEN_EXPIRATION = 5 * 60 + +# Partner support link for CMS footer +PARTNER_SUPPORT_EMAIL = '' diff --git a/cms/templates/widgets/sock.html b/cms/templates/widgets/sock.html index 45edafadbd..463fd6bd27 100644 --- a/cms/templates/widgets/sock.html +++ b/cms/templates/widgets/sock.html @@ -23,7 +23,7 @@ from django.core.urlresolvers import reverse <%! from django.conf import settings - partner_email = settings.FEATURES.get('PARTNER_SUPPORT_EMAIL', '') + partner_email = settings.PARTNER_SUPPORT_EMAIL links = [{ 'href': 'http://docs.edx.org', @@ -49,7 +49,7 @@ from django.core.urlresolvers import reverse 'href': 'mailto:{email}'.format(email=partner_email), 'sr_mouseover_text': _('Send an email to {email}').format(email=partner_email), 'text': _('Contact Us'), - 'condition': 'PARTNER_SUPPORT_EMAIL' in settings.FEATURES + 'condition': bool(partner_email) }] %> diff --git a/themes/edx.org/cms/templates/widgets/sock.html b/themes/edx.org/cms/templates/widgets/sock.html index a11d35ab25..d5df159c7a 100644 --- a/themes/edx.org/cms/templates/widgets/sock.html +++ b/themes/edx.org/cms/templates/widgets/sock.html @@ -23,7 +23,7 @@ from django.core.urlresolvers import reverse <%! from django.conf import settings - partner_email = settings.FEATURES.get('PARTNER_SUPPORT_EMAIL', '') + partner_email = settings.PARTNER_SUPPORT_EMAIL links = [{ 'href': 'http://docs.edx.org', @@ -49,7 +49,7 @@ from django.core.urlresolvers import reverse 'href': 'mailto:{email}'.format(email=partner_email), 'sr_mouseover_text': _('Send an email to {email}').format(email=partner_email), 'text': _('Contact Us'), - 'condition': 'PARTNER_SUPPORT_EMAIL' in settings.FEATURES + 'condition': bool(partner_email) }] %>