From fc88c55c76c8c22f553aab7d37f67f3e63c44d39 Mon Sep 17 00:00:00 2001
From: Douglas Hall <dhall@edx.org>
Date: Thu, 13 Jun 2019 11:07:08 -0400
Subject: [PATCH] Header logo should now redirect to learner dashboard.
(#20815)
---
lms/djangoapps/branding/api.py | 8 +-------
lms/djangoapps/branding/tests/test_api.py | 10 +---------
2 files changed, 2 insertions(+), 16 deletions(-)
diff --git a/lms/djangoapps/branding/api.py b/lms/djangoapps/branding/api.py
index 671ee63e00d..7cb8409e210 100644
--- a/lms/djangoapps/branding/api.py
+++ b/lms/djangoapps/branding/api.py
@@ -587,12 +587,6 @@ def get_about_url():
def get_home_url():
"""
- Lookup and return home page url, lookup is performed in the following order
-
- 1. return marketing root URL, If marketing is enabled
- 2. Otherwise return dashboard URL.
+ Return Dashboard page url
"""
- if settings.FEATURES.get('ENABLE_MKTG_SITE', False):
- return marketing_link('ROOT')
-
return reverse('dashboard')
diff --git a/lms/djangoapps/branding/tests/test_api.py b/lms/djangoapps/branding/tests/test_api.py
index 883fe4ee5d7..23ee29cf542 100644
--- a/lms/djangoapps/branding/tests/test_api.py
+++ b/lms/djangoapps/branding/tests/test_api.py
@@ -37,18 +37,10 @@ class TestHeader(TestCase):
self.assertEqual(logo_url, cdn_url)
- def test_home_url_with_mktg_disabled(self):
+ def test_home_url(self):
expected_url = get_home_url()
self.assertEqual(reverse('dashboard'), expected_url)
- @mock.patch.dict('django.conf.settings.FEATURES', {'ENABLE_MKTG_SITE': True})
- @mock.patch.dict('django.conf.settings.MKTG_URLS', {
- "ROOT": "https://edx.org",
- })
- def test_home_url_with_mktg_enabled(self):
- expected_url = get_home_url()
- self.assertEqual(marketing_link('ROOT'), expected_url)
-
class TestFooter(TestCase):
"""Test retrieving the footer. """
--
GitLab