feat: remove ENABLE_MKTG_SITE from LMS branding views

index() (served at /) now unconditionally checks MKTG_URLS['ROOT'] and
redirects when it differs from LMS_ROOT_URL, matching the previous
ENABLE_MKTG_SITE=True behaviour. The catalog MFE redirect
(ENABLE_CATALOG_MICROFRONTEND) still fires first and is unaffected.
Also fixes a pre-existing bug where log.error() in the NoReverseMatch
handler was passed multiple f-strings as positional args, causing a
TypeError when that branch was reached.

courses() (served at /courses) now resolves in priority order:
1. Redirect to the catalog MFE if ENABLE_CATALOG_MICROFRONTEND is set
2. Permanent redirect to marketing_link('COURSES') from MKTG_URLS
3. Render the local course list via courseware.views.views.courses()

The old ENABLE_MKTG_SITE gate and COURSES_ARE_BROWSABLE guard are
removed. The local course list fallback (case 3) preserves behaviour
for operators who have neither the catalog MFE nor MKTG_URLS['COURSES']
configured.

The stanford-style theme footer is updated to use marketing_link()
instead of reverse() for the 'about' and 'tos' URL routes, which are
removed in a later commit.

Tests drop their @override_settings(ENABLE_MKTG_SITE=True) decorators;
the test names and assertions are otherwise unchanged.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Author: feanil

lms/djangoapps/branding/tests/test_api.py

@@ -46,7 +46,6 @@ class TestFooter(TestCase):
     """Test retrieving the footer. """
     maxDiff = None
 
-    @mock.patch.dict('django.conf.settings.FEATURES', {'ENABLE_MKTG_SITE': True})
     @mock.patch.dict('django.conf.settings.MKTG_URLS', {
         "ROOT": "https://edx.org",
         "ENTERPRISE": "/enterprise"
@@ -62,7 +61,6 @@ def test_footer_business_links_no_marketing_query_params(self):
         business_links = _footer_business_links()
         assert business_links[0]['url'] == 'https://edx.org/enterprise'
 
-    @mock.patch.dict('django.conf.settings.FEATURES', {'ENABLE_MKTG_SITE': True})
     @mock.patch.dict('django.conf.settings.MKTG_URLS', {
         "ROOT": "https://edx.org",
         "ABOUT": "/about-us",

lms/djangoapps/branding/tests/test_views.py

@@ -268,14 +268,12 @@ def test_index_does_not_redirect_without_site_override(self):
         response = self.client.get(reverse("root"))
         assert response.status_code == 200
 
-    @override_settings(ENABLE_MKTG_SITE=True)
     @override_settings(MKTG_URLS={'ROOT': 'https://foo.bar/'})
     @override_settings(LMS_ROOT_URL='https://foo.bar/')
     def test_index_wont_redirect_to_marketing_root_if_it_matches_lms_root(self):
         response = self.client.get(reverse("root"))
         assert response.status_code == 200
 
-    @override_settings(ENABLE_MKTG_SITE=True)
     @override_settings(MKTG_URLS={'ROOT': 'https://home.foo.bar/'})
     @override_settings(LMS_ROOT_URL='https://foo.bar/')
     def test_index_will_redirect_to_new_root_if_mktg_site_is_enabled(self):

lms/djangoapps/branding/views.py

@@ -48,19 +48,13 @@ def index(request):
     if use_catalog_mfe():
         return redirect(f'{settings.CATALOG_MICROFRONTEND_URL}/', permanent=True)
 
-    enable_mktg_site = configuration_helpers.get_value(
-        'ENABLE_MKTG_SITE',
-        getattr(settings, 'ENABLE_MKTG_SITE', False)
+    marketing_urls = configuration_helpers.get_value(
+        'MKTG_URLS',
+        settings.MKTG_URLS
     )
-
-    if enable_mktg_site:
-        marketing_urls = configuration_helpers.get_value(
-            'MKTG_URLS',
-            settings.MKTG_URLS
-        )
-        root_url = marketing_urls.get("ROOT")
-        if root_url != getattr(settings, "LMS_ROOT_URL", None):
-            return redirect(root_url)
+    root_url = marketing_urls.get("ROOT")
+    if root_url and root_url != getattr(settings, "LMS_ROOT_URL", None):
+        return redirect(root_url)
 
     domain = request.headers.get('Host')
 
@@ -76,11 +70,10 @@ def index(request):
         return student_views.index(request, user=request.user)
     except NoReverseMatch:
         log.error(
-            f'https is not a registered namespace Request from {domain}',
-            f'request_site= {request.site.__dict__}',
-            f'enable_mktg_site= {enable_mktg_site}',
-            f'Auth Status= {request.user.is_authenticated}',
-            f'Request Meta= {request.META}'
+            f'NoReverseMatch on index view for domain {domain}; '
+            f'request_site={getattr(request, "site", None)}; '
+            f'Auth Status={request.user.is_authenticated}; '
+            f'Request Meta={request.META}'
         )
         raise
 
@@ -89,26 +82,15 @@ def index(request):
 @cache_if_anonymous()
 def courses(request):
     """
-    Render the "find courses" page. If the marketing site is enabled, redirect
-    to that. Otherwise, if subdomain branding is on, this is the university
-    profile page. Otherwise, it's the edX courseware.views.views.courses page
+    Serve the "find courses" page. Redirects to the catalog MFE or the marketing
+    site COURSES URL if configured; falls back to rendering the local courses page.
     """
     if use_catalog_mfe():
         return redirect(f'{settings.CATALOG_MICROFRONTEND_URL}/courses', permanent=True)
 
-    enable_mktg_site = configuration_helpers.get_value(
-        'ENABLE_MKTG_SITE',
-        settings.FEATURES.get('ENABLE_MKTG_SITE', False)
-    )
-
-    if enable_mktg_site:
-        return redirect(marketing_link('COURSES'), permanent=True)
-
-    if not settings.FEATURES.get('COURSES_ARE_BROWSABLE'):
-        raise Http404
-
-    #  we do not expect this case to be reached in cases where
-    #  marketing is enabled or the courses are not browsable
+    courses_url = marketing_link('COURSES')
+    if courses_url != '#':
+        return redirect(courses_url, permanent=True)
     return courseware_views.courses(request)
 
 

themes/stanford-style/lms/templates/footer.html

@@ -1,9 +1,9 @@
 ## mako
 <%!
   from datetime import date
-  from django.urls import reverse
   from django.utils.translation import gettext as _
   from openedx.core.djangoapps.lang_pref.api import footer_language_selector_is_enabled
+  from common.djangoapps.edxmako.shortcuts import marketing_link
 %>
 <%namespace name='static' file='static_content.html'/>
 <!-- footer overrides for stanford theme go here -->
@@ -12,13 +12,13 @@
     <div class="colophon">
       <nav class="nav-colophon">
         <ol>
-          <li><a href="${reverse('about')}">${_("About")}</a></li>
-          <li><a href="${reverse('about')}#careers">${_("Careers")}</a></li>
-          <li><a href="${reverse('about')}#contact">${_("Contact")}</a></li>
-          <li><a href="${reverse('tos')}">${_("Terms of Service")}</a></li>
-          <li><a href="${reverse('tos')}#privacy">${_("Privacy Policy")}</a></li>
-          <li><a href="${reverse('tos')}#honor">${_("Honor Code")}</a></li>
-          <li><a href="${reverse('tos')}#copyright">${_("Copyright")}</a></li>
+          <li><a href="${marketing_link('ABOUT')}">${_("About")}</a></li>
+          <li><a href="${marketing_link('ABOUT')}#careers">${_("Careers")}</a></li>
+          <li><a href="${marketing_link('ABOUT')}#contact">${_("Contact")}</a></li>
+          <li><a href="${marketing_link('TOS')}">${_("Terms of Service")}</a></li>
+          <li><a href="${marketing_link('TOS')}#privacy">${_("Privacy Policy")}</a></li>
+          <li><a href="${marketing_link('TOS')}#honor">${_("Honor Code")}</a></li>
+          <li><a href="${marketing_link('TOS')}#copyright">${_("Copyright")}</a></li>
         </ol>
       </nav>