From dedf8a9633abdb4f0e9a39ff80d32df62b0da4d8 Mon Sep 17 00:00:00 2001
From: Rob Hudson
Date: Thu, 26 Mar 2009 07:27:17 -0700
Subject: Minor cleanup of imports and long lines.

---
 debug_toolbar/middleware.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'debug_toolbar/middleware.py')

diff --git a/debug_toolbar/middleware.py b/debug_toolbar/middleware.py
index 9c46079..b10ced2 100644
--- a/debug_toolbar/middleware.py
+++ b/debug_toolbar/middleware.py
@@ -1,15 +1,16 @@
 """
 Debug Toolbar middleware
 """
+import os
+
 from django.conf import settings
 from django.http import HttpResponseRedirect
 from django.shortcuts import render_to_response
 from django.utils.encoding import smart_unicode
 from django.conf.urls.defaults import include, patterns
+
 import debug_toolbar.urls
 from debug_toolbar.toolbar.loader import DebugToolbar
-from debug_toolbar.urls import DEBUG_TB_URL_PREFIX
-import os
 
 _HTML_TYPES = ('text/html', 'application/xhtml+xml')
 
@@ -39,8 +40,10 @@ class DebugToolbarMiddleware(object):
     def show_toolbar(self, request):
         if not settings.DEBUG:
             return False
-        if request.is_ajax() and not request.path.startswith(os.path.join('/', DEBUG_TB_URL_PREFIX)): #Allow ajax requests from the debug toolbar
-            return False
+        if request.is_ajax() and not \
+            request.path.startswith(os.path.join('/', debug_toolbar.urls._PREFIX)):
+            # Allow ajax requests from the debug toolbar
+            return False 
         if not request.META.get('REMOTE_ADDR') in settings.INTERNAL_IPS:
             return False
         return True
-- 
cgit v1.2.3


From b9b0cbe718c6a1736af1fa86452ffc4af28b64f4 Mon Sep 17 00:00:00 2001
From: Rob Hudson
Date: Thu, 26 Mar 2009 07:29:26 -0700
Subject: New configuration option to provide your own 'show_toolbar' method.

This change allows a custom method to be used in place of the default 'show_toolbar' method on whether the toolbar should be displayed.---
 debug_toolbar/middleware.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'debug_toolbar/middleware.py')

diff --git a/debug_toolbar/middleware.py b/debug_toolbar/middleware.py
index b10ced2..e4d7494 100644
--- a/debug_toolbar/middleware.py
+++ b/debug_toolbar/middleware.py
@@ -37,7 +37,15 @@ class DebugToolbarMiddleware(object):
         self.original_pattern = patterns('', ('', include(self.original_urlconf)),)
         self.override_url = True
 
-    def show_toolbar(self, request):
+        # Set method to use to decide to show toolbar
+        self.show_toolbar = self._show_toolbar # default
+        if hasattr(settings, 'DEBUG_TOOLBAR_CONFIG'):
+            show_toolbar_callback = settings.DEBUG_TOOLBAR_CONFIG.get(
+                'SHOW_TOOLBAR_CALLBACK', None)
+            if show_toolbar_callback:
+                self.show_toolbar = show_toolbar_callback
+
+    def _show_toolbar(self, request):
         if not settings.DEBUG:
             return False
         if request.is_ajax() and not \
-- 
cgit v1.2.3