From 8701b20899fc526813b425f0233346931f3926e1 Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Wed, 14 Apr 2021 09:46:05 -0400 Subject: [PATCH] Fixes #6155: Fix admin links for plugins, background tasks --- docs/release-notes/version-2.11.md | 1 + netbox/netbox/urls.py | 12 +++++------- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/docs/release-notes/version-2.11.md b/docs/release-notes/version-2.11.md index 9161401ee..0e7bad118 100644 --- a/docs/release-notes/version-2.11.md +++ b/docs/release-notes/version-2.11.md @@ -27,6 +27,7 @@ * [#6123](https://github.com/netbox-community/netbox/issues/6123) - Prevent device from being assigned to mismatched site and location * [#6124](https://github.com/netbox-community/netbox/issues/6124) - Location `parent` filter should return all child locations (not just those directly assigned) * [#6130](https://github.com/netbox-community/netbox/issues/6130) - Improve display of assigned models in custom fields list +* [#6155](https://github.com/netbox-community/netbox/issues/6155) - Fix admin links for plugins, background tasks --- diff --git a/netbox/netbox/urls.py b/netbox/netbox/urls.py index 8215afe1c..a6e2bb052 100644 --- a/netbox/netbox/urls.py +++ b/netbox/netbox/urls.py @@ -63,18 +63,16 @@ _patterns = [ # Serving static media in Django to pipe it through LoginRequiredMiddleware path('media/', serve, {'document_root': settings.MEDIA_ROOT}), - - # Admin - path('admin/', admin_site.urls), - path('admin/background-tasks/', include('django_rq.urls')), - - # Errors path('media-failure/', StaticMediaFailureView.as_view(), name='media_failure'), # Plugins path('plugins/', include((plugin_patterns, 'plugins'))), path('api/plugins/', include((plugin_api_patterns, 'plugins-api'))), - path('admin/plugins/', include(plugin_admin_patterns)) + + # Admin + path('admin/background-tasks/', include('django_rq.urls')), + path('admin/plugins/', include(plugin_admin_patterns)), + path('admin/', admin_site.urls), ]