From 103cfa8b805bcc8e2a01732293c28852ab67bdc3 Mon Sep 17 00:00:00 2001 From: Stuart Mindt Date: Wed, 4 Sep 2024 13:59:17 +0100 Subject: [PATCH 1/2] Removing urls from conf to remove navigation to find a supplier and investment support directory as now in great-cms --- conf/urls.py | 46 +--------------------------------------------- 1 file changed, 1 insertion(+), 45 deletions(-) diff --git a/conf/urls.py b/conf/urls.py index 4a74f68d..d5d44b3c 100644 --- a/conf/urls.py +++ b/conf/urls.py @@ -30,51 +30,7 @@ # Investment Support Directory, Trade and Invest urlpatterns = [ - re_path( - r'^international/investment-support-directory/', - include( - 'investment_support_directory.urls', - namespace='investment-support-directory', - ) - ), - re_path( - r'^international/trade/investment-support-directory/search/', - QuerystringRedirectView.as_view(url='/international/investment-support-directory/') - ), - re_path( - r'^international/trade/', - include( - 'find_a_supplier.urls', - namespace='find-a-supplier', - ) - ), - re_path( - r'^international/content/trade/$', - QuerystringRedirectView.as_view(pattern_name='find-a-supplier:trade-home'), - name='content-trade-home-redirect' - ), - re_path( - r'^international/content/trade/contact/$', - QuerystringRedirectView.as_view(pattern_name='find-a-supplier:industry-contact'), - name='content-trade-contact-redirect' - ), - re_path( - r'^international/trade/incoming/$', - QuerystringRedirectView.as_view(pattern_name='find-a-supplier:trade-home'), - name='trade-incoming-homepage' - ), - # This entry handles all URLs in find_a_supplier/redirects.py - re_path( - r'^international/trade/incoming/(?P[\w\-/]*)/$', - find_a_supplier.views.LegacySupplierURLRedirectView.as_view(), - name='trade-incoming' - ), - # This entry handles all URLs in invest/redirects.py - re_path( - r'^international/invest/incoming/(?P[\w\-/]*)/$', - invest.views.LegacyInvestURLRedirectView.as_view(), - name='invest-incoming' - ), + ] if settings.FEATURE_FLAGS['HOW_TO_SET_UP_REDIRECT_ON']: From 66f8daa2456802d96569992fd63d44d645a442fa Mon Sep 17 00:00:00 2001 From: Stuart Mindt Date: Wed, 4 Sep 2024 15:15:28 +0100 Subject: [PATCH 2/2] Fixing black issues --- conf/urls.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/conf/urls.py b/conf/urls.py index d5d44b3c..a795399a 100644 --- a/conf/urls.py +++ b/conf/urls.py @@ -3,7 +3,7 @@ import directory_healthcheck.views from django.conf import settings -from django.urls import re_path, include +from django.urls import re_path from django.views.static import serve from django.contrib.sitemaps.views import sitemap @@ -11,7 +11,6 @@ from core.views import QuerystringRedirectView import conf.sitemaps from conf.url_redirects import redirects_before_tree_based_routing_lookup -import invest.views import investment_atlas.views import contact.views import find_a_supplier.views @@ -29,9 +28,7 @@ } # Investment Support Directory, Trade and Invest -urlpatterns = [ - -] +urlpatterns = [] if settings.FEATURE_FLAGS['HOW_TO_SET_UP_REDIRECT_ON']: urlpatterns += [