From edb890447473c308d56bfe486aa8480cd9a637a3 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Mon, 26 Dec 2016 12:15:14 -0500 Subject: [PATCH] Fixed debug toolbar display --- netbox/netbox/settings.py | 9 ++++++++- netbox/netbox/urls.py | 6 ++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py index 876f859f1..9fce2e050 100644 --- a/netbox/netbox/settings.py +++ b/netbox/netbox/settings.py @@ -118,7 +118,6 @@ INSTALLED_APPS = ( # Middleware MIDDLEWARE = ( - 'debug_toolbar.middleware.DebugToolbarMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware', 'django.middleware.common.CommonMiddleware', 'django.middleware.csrf.CsrfViewMiddleware', @@ -129,6 +128,8 @@ MIDDLEWARE = ( 'django.middleware.security.SecurityMiddleware', 'utilities.middleware.LoginRequiredMiddleware', ) +if DEBUG: + MIDDLEWARE = ('debug_toolbar.middleware.DebugToolbarMiddleware',) + MIDDLEWARE ROOT_URLCONF = 'netbox.urls' @@ -194,6 +195,12 @@ SWAGGER_SETTINGS = { 'base_path': '{}/{}api/docs'.format(ALLOWED_HOSTS[0], BASE_PATH), } +# Django debug toolbar +INTERNAL_IPS = ( + '127.0.0.1', + '::1', +) + try: HOSTNAME = socket.gethostname() diff --git a/netbox/netbox/urls.py b/netbox/netbox/urls.py index b579671bf..9d01f1773 100644 --- a/netbox/netbox/urls.py +++ b/netbox/netbox/urls.py @@ -42,6 +42,12 @@ _patterns = [ ] +if settings.DEBUG: + import debug_toolbar + _patterns += [ + url(r'^__debug__/', include(debug_toolbar.urls)), + ] + # Prepend BASE_PATH urlpatterns = [ url(r'^{}'.format(settings.BASE_PATH), include(_patterns))