fixed merge conflicts

1 files changed, 8 insertions, 1 deletions

diff --git a/debug_toolbar/middleware.py b/debug_toolbar/middleware.py
index c17c424..fefab18 100644
--- a/debug_toolbar/middleware.py
+++ b/debug_toolbar/middleware.py
@@ -54,13 +54,20 @@ class DebugToolbarMiddleware(object):
 
         if self.show_toolbar(request):
             self.debug_toolbar = DebugToolbar(request)
-            self.debug_toolbar.load_panels()
+            for panel in self.debug_toolbar.panels:
+                panel.process_request(request)
 
         return None
 
+    def process_view(self, request, view_func, view_args, view_kwargs):
+        for panel in self.debug_toolbar.panels:
+            panel.process_view(request, view_func, view_args, view_kwargs)
+
     def process_response(self, request, response):
         if response.status_code != 200:
             return response
+        for panel in self.debug_toolbar.panels:
+            panel.process_response(request, response)
         if self.show_toolbar(request):
             if response['Content-Type'].split(';')[0] in _HTML_TYPES:
                 script_loc = request.META.get('SCRIPT_NAME', '')