estel/netbox
1
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases Wiki Activity

Closes #4942: Make ObjectPermission's 'name' field required

Browse Source
This commit is contained in:
Jeremy Stretch
2020-08-03 16:10:51 -04:00
parent ccb2bf4344
commit ce2dada9fd
5 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
netbox/users/admin.py
View File

@@ -251,7 +251,7 @@ class ObjectPermissionAdmin(admin.ModelAdmin):
filter_horizontal = ('object_types', 'groups', 'users')
form = ObjectPermissionForm
list_display = [
'get_name', 'enabled', 'list_models', 'list_users', 'list_groups', 'actions', 'constraints',
'name', 'enabled', 'list_models', 'list_users', 'list_groups', 'actions', 'constraints',
]
list_filter = [
'enabled', ActionListFilter, ObjectTypeListFilter, 'groups', 'users'
@@ -260,13 +260,6 @@ class ObjectPermissionAdmin(admin.ModelAdmin):
def get_queryset(self, request):
return super().get_queryset(request).prefetch_related('object_types', 'users', 'groups')
def get_name(self, obj):
return '{}: {}'.format(
', '.join([ot.name for ot in obj.object_types.all()]),
', '.join(obj.actions)
)
get_name.short_description = 'Name'
def list_models(self, obj):
return ', '.join([f"{ct}" for ct in obj.object_types.all()])
list_models.short_description = 'Models'