mirror/netbox-community-netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2024-05-10 07:54:54 +00:00
Code Activity

Remove restriction enforcement from RestrictedQuerySet

Browse Source
This commit is contained in:
Jeremy Stretch
2020-07-23 12:48:03 -04:00
parent d23f97abc8
commit cb36f9fdb3
39 changed files with 491 additions and 554 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
netbox/users/admin.py
View File

@ -180,7 +180,7 @@ class ActionListFilter(admin.SimpleListFilter):
def lookups(self, request, model_admin):
options = set()
for action_list in ObjectPermission.objects.unrestricted().values_list('actions', flat=True).distinct():
for action_list in ObjectPermission.objects.values_list('actions', flat=True).distinct():
options.update(action_list)
return [
(action, action) for action in sorted(options)
@ -196,7 +196,7 @@ class ObjectTypeListFilter(admin.SimpleListFilter):
parameter_name = 'object_type'
def lookups(self, request, model_admin):
object_types = ObjectPermission.objects.unrestricted().values_list('id', flat=True).distinct()
object_types = ObjectPermission.objects.values_list('id', flat=True).distinct()
content_types = ContentType.objects.filter(pk__in=object_types).order_by('app_label', 'model')
return [
(ct.pk, ct) for ct in content_types
@ -238,7 +238,7 @@ class ObjectPermissionAdmin(admin.ModelAdmin):
]
def get_queryset(self, request):
return super().get_queryset(request).unrestricted().prefetch_related('object_types', 'users', 'groups')
return super().get_queryset(request).prefetch_related('object_types', 'users', 'groups')
def get_name(self, obj):
return obj.name or f'Permission #{obj.pk}'