From 138e0e1cd53f7609845c9b1e6da0472c30d5a564 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20Zapke-Gru=CC=88ndemann?= <info@keimlink.de>
Date: Fri, 6 Jan 2012 09:25:30 +0100
Subject: Updated django-debug-toolbar and moved to settings.py.

Udpated to 0.9.1. Moved configuration to settings.py to make it work with flatpages app.
---
 conf/dev_settings.py       | 12 +-----------
 requirements_dev.txt       |  2 +-
 sublab_project/settings.py |  8 ++++++++
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/conf/dev_settings.py b/conf/dev_settings.py
index b826822..bd03dc3 100644
--- a/conf/dev_settings.py
+++ b/conf/dev_settings.py
@@ -1,6 +1,6 @@
 import os
 
-from settings import INSTALLED_APPS, LOGGING, MIDDLEWARE_CLASSES, SITE_ROOT
+from settings import LOGGING, SITE_ROOT
 
 AUTH_LDAP_SERVER_URI = 'ldap://taifun.local.sublab.org'
 
@@ -20,16 +20,6 @@ if not os.path.exists(MEDIA_ROOT):
 
 MEDIA_URL = '/media/'
 
-INSTALLED_APPS += ('debug_toolbar',)
-
-MIDDLEWARE_CLASSES += ('debug_toolbar.middleware.DebugToolbarMiddleware',)
-
-INTERNAL_IPS = ('127.0.0.1')
-
-DEBUG_TOOLBAR_CONFIG = {
-        'INTERCEPT_REDIRECTS': False,
-}
-
 LOGGING['loggers'].update({
     '': {
         'handlers': ['debuglog'],
diff --git a/requirements_dev.txt b/requirements_dev.txt
index 9cbaad6..1985120 100644
--- a/requirements_dev.txt
+++ b/requirements_dev.txt
@@ -1,5 +1,5 @@
 --requirement=requirements.txt
 
-django-debug-toolbar==0.8.5
+django-debug-toolbar==0.9.1
 ipdb==0.6.1
 ipython==0.10.1
diff --git a/sublab_project/settings.py b/sublab_project/settings.py
index c879044..d92bf5b 100644
--- a/sublab_project/settings.py
+++ b/sublab_project/settings.py
@@ -101,6 +101,7 @@ TEMPLATE_LOADERS = (
 
 MIDDLEWARE_CLASSES = (
     'django.middleware.common.CommonMiddleware',
+    'debug_toolbar.middleware.DebugToolbarMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
@@ -130,6 +131,7 @@ INSTALLED_APPS = (
     # 'django.contrib.admindocs',
     'django.contrib.flatpages',
     'south',
+    'debug_toolbar',
     'gunicorn',
     'news',
     'projects',
@@ -173,6 +175,12 @@ LOGGING = {
     }
 }
 
+INTERNAL_IPS = ('127.0.0.1')
+
+DEBUG_TOOLBAR_CONFIG = {
+        'INTERCEPT_REDIRECTS': False,
+}
+
 AUTH_PROFILE_MODULE = 'accounts.UserProfile'
 
 AUTH_LDAP_SERVER_URI = 'ldap://oberon.local.sublab.org'
-- 
cgit v1.2.1