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 #4458: Remove custom admin site to avoid conflict with django-rq 2.3.0

Browse Source
This commit is contained in:
Jeremy Stretch
2020-04-07 10:17:34 -04:00
parent 225ba4cc35
commit 902b1b2c32
4 changed files with 19 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
netbox/users/admin.py
View File

@ -3,14 +3,13 @@ from django.contrib import admin
from django.contrib.auth.admin import UserAdmin as UserAdmin_
from django.contrib.auth.models import User
from netbox.admin import admin_site
from .models import Token
# Unregister the built-in UserAdmin so that we can use our custom admin view below
admin_site.unregister(User)
admin.site.unregister(User)
@admin.register(User, site=admin_site)
@admin.register(User)
class UserAdmin(UserAdmin_):
list_display = [
'username', 'email', 'first_name', 'last_name', 'is_superuser', 'is_staff', 'is_active'
@ -30,7 +29,7 @@ class TokenAdminForm(forms.ModelForm):
model = Token
@admin.register(Token, site=admin_site)
@admin.register(Token)
class TokenAdmin(admin.ModelAdmin):
form = TokenAdminForm
list_display = [