NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-12-26 23:27:46 -06:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge branch 'develop' into develop-2.10

Browse Source
This commit is contained in:
Jeremy Stretch
2020-10-30 10:38:05 -04:00
parent 5525d08a5e 275065a5a5
commit 124a43b63f
25 changed files with 634 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
netbox/users/admin.py
View File

@@ -22,7 +22,7 @@ class ObjectPermissionInline(admin.TabularInline):
verbose_name_plural = 'Permissions'
def get_queryset(self, request):
return super().get_queryset(request).prefetch_related('objectpermission__object_types')
return super().get_queryset(request).prefetch_related('objectpermission__object_types').nocache()
@staticmethod
def object_types(instance):
@@ -185,7 +185,7 @@ class ObjectPermissionForm(forms.ModelForm):
# Validate the specified model constraints by attempting to execute a query. We don't care whether the query
# returns anything; we just want to make sure the specified constraints are valid.
if constraints:
if object_types and constraints:
# Normalize the constraints to a list of dicts
if type(constraints) is not list:
constraints = [constraints]