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

Fixes #6064: Fix object permission assignments for user and group models

Browse Source
This commit is contained in:
jeremystretch
2021-05-28 13:27:05 -04:00
parent bd7bcf8a0b
commit 1e02bb5999
3 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
docs/release-notes/version-2.11.md
View File

@ -10,6 +10,7 @@
### Bug Fixes ### Bug Fixes
* [#6064](https://github.com/netbox-community/netbox/issues/6064) - Fix object permission assignments for user and group models
* [#6496](https://github.com/netbox-community/netbox/issues/6496) - Fix upgrade script when Python installed in nonstandard path * [#6496](https://github.com/netbox-community/netbox/issues/6496) - Fix upgrade script when Python installed in nonstandard path
* [#6502](https://github.com/netbox-community/netbox/issues/6502) - Correct permissions evaluation for running a report via the REST API * [#6502](https://github.com/netbox-community/netbox/issues/6502) - Correct permissions evaluation for running a report via the REST API

10
netbox/users/admin.py
View File

@ -7,7 +7,7 @@ from django.core.exceptions import FieldError, ValidationError
from utilities.forms.fields import ContentTypeMultipleChoiceField from utilities.forms.fields import ContentTypeMultipleChoiceField
from .constants import * from .constants import *
from .models import AdminGroup, AdminUser, ObjectPermission, Token, UserConfig from .models import ObjectPermission, Token, UserConfig
# #
@ -39,11 +39,11 @@ class ObjectPermissionInline(admin.TabularInline):
class GroupObjectPermissionInline(ObjectPermissionInline): class GroupObjectPermissionInline(ObjectPermissionInline):
model = AdminGroup.object_permissions.through model = Group.object_permissions.through
class UserObjectPermissionInline(ObjectPermissionInline): class UserObjectPermissionInline(ObjectPermissionInline):
model = AdminUser.object_permissions.through model = User.object_permissions.through
class UserConfigInline(admin.TabularInline): class UserConfigInline(admin.TabularInline):
@ -62,7 +62,7 @@ admin.site.unregister(Group)
admin.site.unregister(User) admin.site.unregister(User)
@admin.register(AdminGroup) @admin.register(Group)
class GroupAdmin(admin.ModelAdmin): class GroupAdmin(admin.ModelAdmin):
fields = ('name',) fields = ('name',)
list_display = ('name', 'user_count') list_display = ('name', 'user_count')
@ -75,7 +75,7 @@ class GroupAdmin(admin.ModelAdmin):
return obj.user_set.count() return obj.user_set.count()
@admin.register(AdminUser) @admin.register(User)
class UserAdmin(UserAdmin_): class UserAdmin(UserAdmin_):
list_display = [ list_display = [
'username', 'email', 'first_name', 'last_name', 'is_superuser', 'is_staff', 'is_active' 'username', 'email', 'first_name', 'last_name', 'is_superuser', 'is_staff', 'is_active'

3
netbox/users/models.py
View File

@ -17,8 +17,6 @@ from .constants import *
__all__ = ( __all__ = (
'AdminGroup',
'AdminUser',
'ObjectPermission', 'ObjectPermission',
'Token', 'Token',
'UserConfig', 'UserConfig',
@ -163,7 +161,6 @@ class UserConfig(models.Model):
@receiver(post_save, sender=User) @receiver(post_save, sender=User)
@receiver(post_save, sender=AdminUser)
def create_userconfig(instance, created, **kwargs): def create_userconfig(instance, created, **kwargs):
""" """
Automatically create a new UserConfig when a new User is created. Automatically create a new UserConfig when a new User is created.