From 717dc6815a9d4ddcd30efc17db11ade0f8f38354 Mon Sep 17 00:00:00 2001 From: bkonkle Date: Thu, 15 Sep 2011 10:36:11 -0500 Subject: Edited all of the panels to use the stats API and not override the content method --- debug_toolbar/panels/request_vars.py | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) (limited to 'debug_toolbar/panels/request_vars.py') diff --git a/debug_toolbar/panels/request_vars.py b/debug_toolbar/panels/request_vars.py index 80cd018..ee9cdc5 100644 --- a/debug_toolbar/panels/request_vars.py +++ b/debug_toolbar/panels/request_vars.py @@ -1,7 +1,5 @@ -from django.template.loader import render_to_string from django.utils.translation import ugettext_lazy as _ -from debug_toolbar.middleware import DebugToolbarMiddleware from debug_toolbar.panels import DebugPanel from debug_toolbar.utils import get_name_from_obj @@ -10,6 +8,7 @@ class RequestVarsDebugPanel(DebugPanel): A panel to display request variables (POST/GET, session, cookies). """ name = 'RequestVars' + template = 'debug_toolbar/panels/request_vars.html' has_content = True def __init__(self, *args, **kwargs): @@ -36,11 +35,11 @@ class RequestVarsDebugPanel(DebugPanel): self.view_kwargs = view_kwargs def process_response(self, request, response): - self.stats = { + self.record_stats({ 'get': [(k, self.request.GET.getlist(k)) for k in self.request.GET], 'post': [(k, self.request.POST.getlist(k)) for k in self.request.POST], 'cookies': [(k, self.request.COOKIES.get(k)) for k in self.request.COOKIES], - } + }) if hasattr(self, 'view_func'): if self.view_func is not None: @@ -48,21 +47,13 @@ class RequestVarsDebugPanel(DebugPanel): else: name = '' - self.stats.update({ + self.record_stats({ 'view_func': name, 'view_args': self.view_args, 'view_kwargs': self.view_kwargs }) if hasattr(self.request, 'session'): - self.stats.update({ + self.record_stats({ 'session': [(k, self.request.session.get(k)) for k in self.request.session.iterkeys()] }) - - toolbar = DebugToolbarMiddleware.get_current() - toolbar.stats['request_vars'] = self.stats - - def content(self): - context = self.context.copy() - context.update(self.stats) - return render_to_string('debug_toolbar/panels/request_vars.html', context) -- cgit v1.2.3