From e7e79c9b24b407f818fb3ae09cf93e9c76615ad3 Mon Sep 17 00:00:00 2001 From: Uman Shahzad Date: Mon, 5 Jun 2017 00:28:46 +0500 Subject: [PATCH] Correct activation email support link defaults in views.py --- common/djangoapps/student/tests/test_activate_account.py | 4 ++-- common/djangoapps/student/views.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/common/djangoapps/student/tests/test_activate_account.py b/common/djangoapps/student/tests/test_activate_account.py index 309ebbce59..0dea4faa23 100644 --- a/common/djangoapps/student/tests/test_activate_account.py +++ b/common/djangoapps/student/tests/test_activate_account.py @@ -33,8 +33,8 @@ class TestActivateAccount(TestCase): self.platform_name = configuration_helpers.get_value('PLATFORM_NAME', settings.PLATFORM_NAME) self.activation_email_support_link = configuration_helpers.get_value( - 'ACTIVATION_EMAIL_SUPPORT_LINK', settings.SUPPORT_SITE_LINK # Intentional default. - ) + 'ACTIVATION_EMAIL_SUPPORT_LINK', settings.ACTIVATION_EMAIL_SUPPORT_LINK + ) or settings.SUPPORT_SITE_LINK def login(self): """ diff --git a/common/djangoapps/student/views.py b/common/djangoapps/student/views.py index e388487c32..acd0c016d6 100644 --- a/common/djangoapps/student/views.py +++ b/common/djangoapps/student/views.py @@ -652,8 +652,8 @@ def dashboard(request): settings.FEATURES.get('DISPLAY_COURSE_MODES_ON_DASHBOARD', True) ) activation_email_support_link = configuration_helpers.get_value( - 'ACTIVATION_EMAIL_SUPPORT_LINK', settings.SUPPORT_SITE_LINK - ) + 'ACTIVATION_EMAIL_SUPPORT_LINK', settings.ACTIVATION_EMAIL_SUPPORT_LINK + ) or settings.SUPPORT_SITE_LINK # Let's filter out any courses in an "org" that has been declared to be # in a configuration