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

Merge branch 'develop-2.6' into 3077-nested-api-writes

Browse Source
This commit is contained in:
Jeremy Stretch
2019-04-17 10:57:01 -04:00
committed by GitHub
parent a108807534 dbe0e9506d
commit 655e48823a
2 changed files with 17 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
netbox/netbox/admin.py
View File

@@ -2,17 +2,6 @@ from django.conf import settings
from django.contrib.admin import AdminSite
from django.contrib.auth.admin import GroupAdmin, UserAdmin
from django.contrib.auth.models import Group, User
from taggit.admin import TagAdmin, TaggedItemInline
from extras.models import Tag, TaggedItem
class NetBoxTaggedItemInline(TaggedItemInline):
model = TaggedItem
class NetBoxTagAdmin(TagAdmin):
inlines = [NetBoxTaggedItemInline]
class NetBoxAdminSite(AdminSite):
@@ -29,7 +18,6 @@ admin_site = NetBoxAdminSite(name='admin')
# Register external models
admin_site.register(Group, GroupAdmin)
admin_site.register(User, UserAdmin)
admin_site.register(Tag, NetBoxTagAdmin)
# Modify the template to include an RQ link if django_rq is installed (see RQ_SHOW_ADMIN_LINK)
if settings.WEBHOOKS_ENABLED: