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

Correct activation email support link defaults in views.py

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

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