Added settings and exceptions to for ajax update

Author: miketheprogrammer

debug_toolbar/middleware.py

@@ -8,12 +8,13 @@
 from django.conf import settings
 from django.http import HttpResponseRedirect
 from django.shortcuts import render_to_response
+from django.utils import simplejson
 from django.utils.encoding import smart_unicode
 from django.utils.importlib import import_module
-
 import debug_toolbar.urls
 from debug_toolbar.toolbar.loader import DebugToolbar
 
+
 _HTML_TYPES = ('text/html', 'application/xhtml+xml')
 
 
@@ -121,18 +122,26 @@ def process_response(self, request, response):
         toolbar = self.__class__.debug_toolbars.get(ident)
 
         if not toolbar or request.is_ajax():
-            for panel in toolbar.panels:
-                panel.process_response(request, response)
 
-            rendered = toolbar.render_toolbar()
-            from django.utils import simplejson
-            rendered = simplejson.dumps({'rendered':rendered})
+            if settings.DEBUG_TOOLBAR_CONFIG['ACCEPT_AJAX']:
+
+                try:
+                    simplejson.loads(response.content)
+                except simplejson.JSONDecodeError:
+                    return response
+                for panel in toolbar.panels:
+                    panel.process_response(request, response)
+
+                rendered = toolbar.render_toolbar()
+                
+                rendered = simplejson.dumps({'rendered':rendered})
+
+                if '{replace}' not in response.content:
+                       if response.content[-1] == '}':
+                            response.content = response.content[:-1] + ', "replace":"{replace}"}'
 
-            if '{replace}' not in response.content:
-                   if response.content[-1] == '}':
-                        response.content = response.content[:-1] + ', "replace":"{replace}"}'
+                response.content = response.content.replace('"{replace}"', rendered)
 
-            response.content = response.content.replace('"{replace}"', rendered)
             return response
         if isinstance(response, HttpResponseRedirect):
             if not toolbar.config['INTERCEPT_REDIRECTS']:

debug_toolbar/templates/debug_toolbar/base.html

@@ -6,6 +6,7 @@
 
 
 <script type="text/javascript">
+{% if inject_ajax_processor %}
 window.total_time_first_run = true;
 window.total_time = 0.0;
 window.toolbars = [];
@@ -47,20 +48,15 @@
 
 $(document).ready(function() {
   $(document).ajaxSuccess(function(e, xhr, settings) {
-  	console.log('e');
-  	console.log(e);
-  	console.log('xhr');
-  	console.log(xhr);
   	var data;
   	if (xhr.responseText.length > 5){
   		data = $.parseJSON(xhr.responseText);
   	}
     window.refreshDjdt(data, e, xhr, settings);
-
-    console.log(settings);
-    console.log(settings.url);
   });
 });
+
+{% endif %}
 /*!
  * jQuery JavaScript Library v1.7.1
  * http://jquery.com/
@@ -156,13 +152,10 @@ <h3>{{ panel.title|safe }}</h3>
 
 <script type="text/javascript">
 
+{% if inject_ajax_processor %}
 window.refreshDjdt = function(ajax_data, e, xhr, settings){
-    console.log('refreshing');
     console.log(ajax_data);
 
-    if (ajax_data == 'OK'){
-    	return false;
-    }
     if (ajax_data == undefined){
     	return false;
     }
@@ -209,5 +202,5 @@ <h3>{{ panel.title|safe }}</h3>
     }
 }
 
-
+{% endif %}
 </script>

debug_toolbar/templates/debug_toolbar/panels/history.html

@@ -6,9 +6,9 @@
 	</colgroup>
 	<thead>
 		<tr>
-			<th>{% trans "Resource" %}</th>
-			<th>{% trans "Value" %}</th>
-			<th>{% trans "Elapsed Time(ms)" %}</th>
+			<th>{% trans "Resource" %}  | </th>
+			<th>{% trans "Display Link" %}  |</th>
+			<th>{% trans "Elapsed Time(ms)" %}  |</th>
 		</tr>
 	</thead>
 	<tbody id='history_panel_body'>

debug_toolbar/toolbar/__init__.py

@@ -28,6 +28,8 @@ def __init__(self, request):
             'DEBUG_TOOLBAR_MEDIA_URL': self.config.get('MEDIA_URL'),
             'STATIC_URL': settings.STATIC_URL,
         }
+        if settings.DEBUG_TOOLBAR_CONFIG['ACCEPT_AJAX']:
+            self.template_context['inject_ajax_processor'] = True
 
         self.load_panels()
         self.stats = {}
@@ -56,11 +58,13 @@ def render_toolbar(self):
         """
         Renders the overall Toolbar with panels inside.
         """
+
         context = self.template_context.copy()
+        print context
         context.update({
             'panels': self.panels,
         })
-
+        #print render_to_string('debug_toolbar/base.html', context)
         return render_to_string('debug_toolbar/base.html', context)
 
 
@@ -83,6 +87,7 @@ def load_panel_classes():
         'debug_toolbar.panels.cache.CacheDebugPanel',
         'debug_toolbar.panels.signals.SignalDebugPanel',
         'debug_toolbar.panels.logger.LoggingPanel',
+        'debug_toolbar.panels.history.AjaxHistoryPanel',
     ))
     for panel_path in panels:
         try: