From 002c0bf4be1b2f44d23195822739855755ad195a Mon Sep 17 00:00:00 2001 From: Arthur Date: Fri, 14 Jul 2023 11:27:52 +0700 Subject: [PATCH] 12589 review changes --- netbox/users/views.py | 3 --- netbox/utilities/views.py | 5 ++--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/netbox/users/views.py b/netbox/users/views.py index 52ff09140..1f997ca38 100644 --- a/netbox/users/views.py +++ b/netbox/users/views.py @@ -397,9 +397,6 @@ class NetBoxUserEditView(generic.ObjectEditView): class NetBoxUserDeleteView(generic.ObjectDeleteView): queryset = NetBoxUser.objects.all() - def get_required_permission(self): - return get_permission_for_model(User, 'delete') - class NetBoxUserBulkEditView(generic.BulkEditView): queryset = NetBoxUser.objects.all() diff --git a/netbox/utilities/views.py b/netbox/utilities/views.py index c10e8bcbd..a639524b7 100644 --- a/netbox/utilities/views.py +++ b/netbox/utilities/views.py @@ -79,9 +79,8 @@ class ObjectPermissionRequiredMixin(AccessMixin): if user.has_perms((permission_required, *self.additional_permissions)): # Update the view's QuerySet to filter only the permitted objects - if isinstance(self.queryset, RestrictedQuerySet): - action = resolve_permission(permission_required)[1] - self.queryset = self.queryset.restrict(user, action) + action = resolve_permission(permission_required)[1] + self.queryset = self.queryset.restrict(user, action) return True