From c9fad7b79c346875a636122fdc7514814180dbc7 Mon Sep 17 00:00:00 2001 From: ismail Date: Thu, 26 Jun 2025 12:00:16 +0300 Subject: [PATCH] fix the middleware issue --- inventory/middleware.py | 7 +++---- inventory/urls.py | 2 +- inventory/views.py | 9 --------- templates/dashboards/manager.html | 4 ++-- templates/header.html | 2 +- 5 files changed, 7 insertions(+), 17 deletions(-) diff --git a/inventory/middleware.py b/inventory/middleware.py index a68653ce..e35e80f2 100644 --- a/inventory/middleware.py +++ b/inventory/middleware.py @@ -124,8 +124,7 @@ class DealerSlugMiddleware: def process_view(self, request, view_func, view_args, view_kwargs): if request.user.is_authenticated: dealer = get_user_type(request) - if "dealer_slug" not in view_kwargs: - return redirect("home", dealer_slug=dealer.slug, **view_kwargs) - elif view_kwargs["dealer_slug"] != dealer.slug: - raise Http404("Dealer slug mismatch") + if view_kwargs.get("dealer_slug"): + if view_kwargs["dealer_slug"] != dealer.slug: + raise Http404("Dealer slug mismatch") return None diff --git a/inventory/urls.py b/inventory/urls.py index 94b061ba..0de89f7a 100644 --- a/inventory/urls.py +++ b/inventory/urls.py @@ -9,7 +9,7 @@ from django.conf.urls import handler403, handler400, handler404, handler500 urlpatterns = [ # main URLs path("", views.HomeView.as_view(), name="home"), - path("/", views.HomeView.as_view(), name="home"), + # path("/", views.HomeView.as_view(), name="home"), path("welcome/", views.WelcomeView.as_view(), name="welcome"), # Accounts URLs # path("login/", allauth_views.LoginView.as_view(template_name="account/login.html"), name="account_login"), diff --git a/inventory/views.py b/inventory/views.py index 6b263ebe..37e3adb4 100644 --- a/inventory/views.py +++ b/inventory/views.py @@ -349,15 +349,6 @@ class HomeView(LoginRequiredMixin, TemplateView): template_name = "index.html" - def dispatch(self, request, *args, **kwargs): - # Redirect unauthenticated users to the welcome page - if not request.user.is_authenticated: - return redirect("welcome") - if not kwargs.get("dealer_slug"): - dealer = get_user_type(request) - return redirect("home", dealer_slug=dealer.slug) - return super().dispatch(request, *args, **kwargs) - class TestView(TemplateView): """ diff --git a/templates/dashboards/manager.html b/templates/dashboards/manager.html index fb2b569a..6a259ec8 100644 --- a/templates/dashboards/manager.html +++ b/templates/dashboards/manager.html @@ -12,7 +12,7 @@
-

{{ staff }}

 +

{{ staff }}

{{ _("Staff")}}

@@ -32,7 +32,7 @@
-

{{ estimates }}

 +

{{ estimates }}

{{ _("Quotations")}}

diff --git a/templates/header.html b/templates/header.html index 36bebf73..b12cd682 100644 --- a/templates/header.html +++ b/templates/header.html @@ -358,7 +358,7 @@ aria-label="Toggle Navigation"> - +
haikal haikal