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

Fixes #4458: Remove custom admin site to avoid conflict with django-rq 2.3.0

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

View File

@@ -1,12 +1,11 @@
from django.contrib import admin, messages
from django.shortcuts import redirect, render
from netbox.admin import admin_site
from .forms import ActivateUserKeyForm
from .models import UserKey
@admin.register(UserKey, site=admin_site)
@admin.register(UserKey)
class UserKeyAdmin(admin.ModelAdmin):
actions = ['activate_selected']
list_display = ['user', 'is_filled', 'is_active', 'created']