Merge pull request #127 from benjaoming/djtb

Fix setup for latest django-debug-toolbar
kbhff · Oct 10, 2016 · 3604e95 · 3604e95
2 parents 57432fe + 811d32d
commit 3604e95
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/eggplant_project/settings/base.py b/eggplant_project/settings/base.py
@@ -54,8 +54,8 @@
 
 # Application definition
 
-INSTALLED_APPS = (
-    'suit',  # django-admin-bootstrapped
+INSTALLED_APPS = [
+    'suit',
 
     'django.contrib.admin',
     'django.contrib.auth',
@@ -84,7 +84,7 @@
     'eggplant.permissions',
     'eggplant.profiles',
     'eggplant.roles',
-)
+]
 
 MIDDLEWARE_CLASSES = (
     'django.contrib.sessions.middleware.SessionMiddleware',

diff --git a/eggplant_project/urls.py b/eggplant_project/urls.py
@@ -35,3 +35,10 @@
     url(r'^', include('eggplant.urls', namespace='eggplant')),
 
 ] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
+
+
+if settings.DEBUG:
+    import debug_toolbar
+    urlpatterns += [
+        url(r'^__debug__/', include(debug_toolbar.urls)),
+    ]