Merge lp:~daker/loco-team-portal/djdt-support into lp:loco-team-portal

[Adnane Belmadiaf]

Add support for django debug toolbar to make debugging easier

[lp:~daker/loco-team-portal/djdt-support]

561. By Adnane Belmadiaf on 2012-11-16

* Fixes from mhall & chris

[Michael Hall (mhall119)]

Looks good to me

review: Approve

[Chris Johnston (cjohnston)]

review: Approve

=== modified file 'loco_directory/local_settings.py.sample'
--- loco_directory/local_settings.py.sample	2010-07-30 16:14:42 +0000
+++ loco_directory/local_settings.py.sample	2012-11-16 21:03:20 +0000
@@ -3,6 +3,8 @@
 #DATABASE_USER = ''
 #DATABASE_PASSWORD = ''
 
-SECRET_KEY = '' 
+SECRET_KEY = ''
 
 DEBUG_USERS = ('')
+
+INTERNAL_IPS = ('127.0.0.1', '10.0.2.2')

=== modified file 'loco_directory/settings.py'
--- loco_directory/settings.py	2012-11-09 23:47:43 +0000
+++ loco_directory/settings.py	2012-11-16 21:03:20 +0000
@@ -45,6 +45,7 @@
 DEBUG = True
 TEMPLATE_DEBUG = DEBUG
 STATIC_SERVE = True
+USE_DEBUG_TOOLBAR = False
 
 OPENID_STRICT_USERNAMES = True
 OPENID_FOLLOW_RENAMES = True
@@ -216,3 +217,33 @@
     from local_settings import *
 except ImportError:
     logging.warning("No local_settings.py were found. See INSTALL for instructions.")
+
+
+if DEBUG and USE_DEBUG_TOOLBAR:
+    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.sql.SQLDebugPanel',
+        'debug_toolbar.panels.template.TemplateDebugPanel',
+        'debug_toolbar.panels.cache.CacheDebugPanel',
+        'debug_toolbar.panels.logger.LoggingPanel',
+    )
+
+    DEBUG_TOOLBAR_CONFIG = {
+        'INTERCEPT_REDIRECTS': False,
+    }
+
+    def show_toolbar(request):
+        return True
+    SHOW_TOOLBAR_CALLBACK = show_toolbar

=== modified file 'requirements/dev.txt'
--- requirements/dev.txt	2012-11-16 18:33:47 +0000
+++ requirements/dev.txt	2012-11-16 21:03:20 +0000
@@ -15,6 +15,7 @@
 simplejson==2.0.9
 feedparser
 pylint==0.25.0
+django-debug-toolbar==0.8.4
 
 # Non-standard dependencies
 -f http://launchpad.net/launchpadlib/trunk/1.6.0/+download/launchpadlib-1.6.0.tar.gz#egg=launchpadlib-1.6.0