Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #15241 from open-craft/uman/fix_activation_email_default

Browse Source 
Correct activation email support link defaults in views.py
This commit is contained in:
Douglas Hall
2017-06-05 10:11:30 -04:00
committed by GitHub
parent 9b18469d54 e7e79c9b24
commit 1c7e435407
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
common/djangoapps/student/tests/test_activate_account.py
View File

@@ -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):
"""

4
common/djangoapps/student/views.py
View File

@@ -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