diff --git a/InvenTree/InvenTree/urls.py b/InvenTree/InvenTree/urls.py index 1208e52cb1..3a9a00d214 100644 --- a/InvenTree/InvenTree/urls.py +++ b/InvenTree/InvenTree/urls.py @@ -217,9 +217,6 @@ classic_frontendpatterns = [ re_path(r'^accounts/', include('allauth.urls')), # included urlpatterns ] - -new_frontendpatterns = platform_urls - urlpatterns = [] if settings.INVENTREE_ADMIN_ENABLED: @@ -236,7 +233,7 @@ frontendpatterns = [] if settings.ENABLE_CLASSIC_FRONTEND: frontendpatterns += classic_frontendpatterns if settings.ENABLE_PLATFORM_FRONTEND: - frontendpatterns += new_frontendpatterns + frontendpatterns += platform_urls urlpatterns += frontendpatterns diff --git a/InvenTree/web/urls.py b/InvenTree/web/urls.py index 35726815ac..ea3f893729 100644 --- a/InvenTree/web/urls.py +++ b/InvenTree/web/urls.py @@ -17,15 +17,15 @@ class RedirectAssetView(TemplateView): spa_view = ensure_csrf_cookie(TemplateView.as_view(template_name="web/index.html")) +assets_path = path("assets/", RedirectAssetView.as_view()) urlpatterns = [ - path(f'{settings.FRONTEND_URL_BASE}/', include([ - path("assets/", RedirectAssetView.as_view()), - re_path(r"^(?P.*)/$", spa_view), - path("set-password?uid=&token=", spa_view, name="password_reset_confirm"), - path("", spa_view),] - )), - path(settings.FRONTEND_URL_BASE, spa_view, name='platform'), - path("assets/", RedirectAssetView.as_view()), + path(f"{settings.FRONTEND_URL_BASE}/", include([ + assets_path, + path("set-password?uid=&token=", spa_view, name="password_reset_confirm",), + re_path(".*", spa_view), + ])), + assets_path, + path(settings.FRONTEND_URL_BASE, spa_view, name="platform"), ]