From ee837a347ab48494df92ed0470f6729fe8f56db9 Mon Sep 17 00:00:00 2001
From: Rickey Visinski
Date: Fri, 24 Aug 2012 13:01:43 -0400
Subject: prevent debug toolbar from inserting itself into a partial template
 called via ajax. Prevents overwriting the current toolbar on the page and
 rendering the event listeners on toolbar panel buttons useless

---
 debug_toolbar/middleware.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/debug_toolbar/middleware.py b/debug_toolbar/middleware.py
index 6e86223..e063b3b 100644
--- a/debug_toolbar/middleware.py
+++ b/debug_toolbar/middleware.py
@@ -118,6 +118,8 @@ class DebugToolbarMiddleware(object):
         toolbar = self.__class__.debug_toolbars.get(ident)
         if not toolbar:
             return response
+        if 'XMLHttpRequest' in request.META.get('HTTP_X_REQUESTED_WITH', ''):
+            return response
         if isinstance(response, HttpResponseRedirect):
             if not toolbar.config['INTERCEPT_REDIRECTS']:
                 return response
-- 
cgit v1.2.3


From 4d0b77e446c62e40387228aea39056424232b827 Mon Sep 17 00:00:00 2001
From: Rickey Visinski
Date: Fri, 24 Aug 2012 13:10:13 -0400
Subject: saving characters, and let django sort out the ajaxness

---
 debug_toolbar/middleware.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/debug_toolbar/middleware.py b/debug_toolbar/middleware.py
index e063b3b..1979e1d 100644
--- a/debug_toolbar/middleware.py
+++ b/debug_toolbar/middleware.py
@@ -116,9 +116,7 @@ class DebugToolbarMiddleware(object):
         __traceback_hide__ = True
         ident = thread.get_ident()
         toolbar = self.__class__.debug_toolbars.get(ident)
-        if not toolbar:
-            return response
-        if 'XMLHttpRequest' in request.META.get('HTTP_X_REQUESTED_WITH', ''):
+        if not toolbar or request.is_ajax():
             return response
         if isinstance(response, HttpResponseRedirect):
             if not toolbar.config['INTERCEPT_REDIRECTS']:
-- 
cgit v1.2.3