From 12d480659e6ecd21c8c5b8a380f6212d4dbd6518 Mon Sep 17 00:00:00 2001 From: gitea Date: Wed, 26 Feb 2025 13:01:22 +0000 Subject: [PATCH] update --- inventory/models.py | 4 ++-- inventory/views.py | 4 ++-- templates/header.html | 10 +++++++--- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/inventory/models.py b/inventory/models.py index d8c9130a..18ffe632 100644 --- a/inventory/models.py +++ b/inventory/models.py @@ -955,11 +955,11 @@ class Staff(models.Model, LocalizedNameMixin): objects = StaffUserManager() @property - def user(self): + def get_user(self): return self.staff_member.user @property - def groups(self): + def get_groups(self): return [x.customgroup for x in self.user.groups.all()] diff --git a/inventory/views.py b/inventory/views.py index ecfb4c32..db6b157f 100644 --- a/inventory/views.py +++ b/inventory/views.py @@ -2632,11 +2632,11 @@ class LeadListView(ListView): def get_queryset(self): dealer = get_user_type(self.request) - print(dealer.user) + print(dealer) staffmember = getattr(self.request.user, "staffmember", None) if staffmember: qs = models.Lead.objects.filter(dealer=dealer) - if staffmember.staff.staff_type == models.StaffTypes.MANAGER or self.request.user == dealer.user: + if staffmember.staff.staff_type == models.StaffTypes.MANAGER: return qs return qs.filter(staff=staffmember.staff) return models.Lead.objects.none() diff --git a/templates/header.html b/templates/header.html index b118e34d..0fe05859 100644 --- a/templates/header.html +++ b/templates/header.html @@ -32,7 +32,7 @@ @@ -429,8 +429,12 @@ {% else %} {% endif %} - -
{{ user }}
+ + {% if user.dealer %} +
{{ user.dealer.get_local_name }}
+ {% else %} +
{{ user.staff.get_local_name }}
+ {% endif %}