mirror of
https://github.com/netbox-community/netbox.git
synced 2025-08-26 01:06:11 -06:00
12591 move check for restrictedqueryset
This commit is contained in:
parent
03705a3e61
commit
cd5f3cc318
@ -79,8 +79,9 @@ class ObjectPermissionRequiredMixin(AccessMixin):
|
|||||||
if user.has_perms((permission_required, *self.additional_permissions)):
|
if user.has_perms((permission_required, *self.additional_permissions)):
|
||||||
|
|
||||||
# Update the view's QuerySet to filter only the permitted objects
|
# Update the view's QuerySet to filter only the permitted objects
|
||||||
action = resolve_permission(permission_required)[1]
|
if isinstance(self.queryset, RestrictedQuerySet):
|
||||||
self.queryset = self.queryset.restrict(user, action)
|
action = resolve_permission(permission_required)[1]
|
||||||
|
self.queryset = self.queryset.restrict(user, action)
|
||||||
|
|
||||||
return True
|
return True
|
||||||
|
|
||||||
@ -94,7 +95,7 @@ class ObjectPermissionRequiredMixin(AccessMixin):
|
|||||||
'a base queryset'.format(self.__class__.__name__)
|
'a base queryset'.format(self.__class__.__name__)
|
||||||
)
|
)
|
||||||
|
|
||||||
if isinstance(self.queryset, RestrictedQuerySet) and not self.has_permission():
|
if not self.has_permission():
|
||||||
return self.handle_no_permission()
|
return self.handle_no_permission()
|
||||||
|
|
||||||
return super().dispatch(request, *args, **kwargs)
|
return super().dispatch(request, *args, **kwargs)
|
||||||
|
Loading…
Reference in New Issue
Block a user