Merge branch 'v3.0'

1 files changed, 32 insertions, 2 deletions

diff --git a/chimere_example_project/settings.py b/chimere_example_project/settings.py
index 0854443..360e66d 100644
--- a/chimere_example_project/settings.py
+++ b/chimere_example_project/settings.py
@@ -10,6 +10,9 @@ _ = lambda s: s
 DEBUG = False
 TEMPLATE_DEBUG = DEBUG
 MOBILE_TEST = False
+DEBUG_TOOLBAR = False
+SQL_DEBUG = False
+
 
 # Django settings for chimere project.
 PROJECT_NAME = 'Chimere'
@@ -211,13 +214,13 @@ TEMPLATE_LOADERS = (
     'django.template.loaders.app_directories.Loader',
 )
 
-MIDDLEWARE_CLASSES = (
+MIDDLEWARE_CLASSES = [
     'django.middleware.common.CommonMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.middleware.doc.XViewMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware'
-)
+]
 
 ROOT_URLCONF = 'chimere_example_project.urls'
 
@@ -349,3 +352,30 @@ if 'OSM_MOBILE_JS_URLS' not in globals():
         STATIC_URL + "openlayers/OpenLayers.mobile.js",
         STATIC_URL + "openlayers/SimplePanZoom.js",
         "http://www.openstreetmap.org/openlayers/OpenStreetMap.js"]
+
+if DEBUG_TOOLBAR:
+    if '..' not in sys.path:
+        sys.path.insert(0, '..')
+    global DEBUG_TOOLBAR_PANELS
+    global DEBUG_TOOLBAR_CONFIG
+    MIDDLEWARE_CLASSES += ['debug_toolbar.middleware.DebugToolbarMiddleware']
+    INSTALLED_APPS += ['debug_toolbar']
+    DEBUG_TOOLBAR_PANELS = (
+        'debug_toolbar.panels.version.VersionDebugPanel',
+        'debug_toolbar.panels.timer.TimerDebugPanel',
+        'debug_toolbar.panels.settings_vars.SettingsVarsDebugPanel',
+        'debug_toolbar.panels.headers.HeaderDebugPanel',
+        'debug_toolbar.panels.request_vars.RequestVarsDebugPanel',
+        'debug_toolbar.panels.template.TemplateDebugPanel',
+        'debug_toolbar.panels.sql.SQLDebugPanel',
+        'debug_toolbar.panels.signals.SignalDebugPanel',
+        'debug_toolbar.panels.logger.LoggingPanel',
+    )
+    DEBUG_TOOLBAR_CONFIG = {'INTERCEPT_REDIRECTS': False}
+
+
+if SQL_DEBUG:
+    LOGGING['loggers']['django.db.backends'] = {
+        'level': 'DEBUG',
+        'handlers': ['console'],
+    }