diff options
| author | Matt George | 2008-09-30 22:13:28 -0500 |
|---|---|---|
| committer | Matt George | 2008-09-30 22:13:28 -0500 |
| commit | 70278e8054dd0b0abb466d2fe7a043a10e871a37 (patch) | |
| tree | 8cf7dab1b73f42786e17b29a9416798aed2c3e70 /debug_toolbar/middleware.py | |
| parent | 4734384cecd18ee6497730dc997aa34040975d13 (diff) | |
| parent | 51a79cfcb7d731f951647778d504a3e654d4883f (diff) | |
| download | django-debug-toolbar-70278e8054dd0b0abb466d2fe7a043a10e871a37.tar.bz2 | |
Merge branch 'master' of git://github.com/robhudson/django-debug-toolbar
Diffstat (limited to 'debug_toolbar/middleware.py')
| -rw-r--r-- | debug_toolbar/middleware.py | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/debug_toolbar/middleware.py b/debug_toolbar/middleware.py index 6d2391c..140ceba 100644 --- a/debug_toolbar/middleware.py +++ b/debug_toolbar/middleware.py @@ -3,6 +3,8 @@ Debug Toolbar middleware """ import re from django.conf import settings +from django.http import HttpResponseRedirect +from django.shortcuts import render_to_response from django.utils.encoding import smart_str from django.conf.urls.defaults import include, patterns import debug_toolbar.urls @@ -57,14 +59,21 @@ class DebugToolbarMiddleware(object): def process_response(self, request, response): if not self.debug_toolbar: return response + if self.debug_toolbar.config['INTERCEPT_REDIRECTS']: + if isinstance(response, HttpResponseRedirect): + redirect_to = response.get('Location', None) + if redirect_to: + response = render_to_response( + 'debug_toolbar/redirect.html', + {'redirect_to': redirect_to} + ) 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: - # Saving this here in case we ever need to inject into <head> - #response.content = _END_HEAD_RE.sub(smart_str(self.debug_toolbar.render_styles() + "%s" % match.group()), response.content) - response.content = _START_BODY_RE.sub(smart_str('<body\\1>' + self.debug_toolbar.render_toolbar()), response.content) - response.content = _END_BODY_RE.sub(smart_str('<script src="' + request.META.get('SCRIPT_NAME', '') + '/__debug__/m/toolbar.js" type="text/javascript" charset="utf-8"></script></body>'), response.content) + if response['Content-Type'].split(';')[0] in _HTML_TYPES: + # Saving this here in case we ever need to inject into <head> + #response.content = _END_HEAD_RE.sub(smart_str(self.debug_toolbar.render_styles() + "%s" % match.group()), response.content) + response.content = _START_BODY_RE.sub(smart_str('<body\\1>' + self.debug_toolbar.render_toolbar()), response.content) + response.content = _END_BODY_RE.sub(smart_str('<script src="' + request.META.get('SCRIPT_NAME', '') + '/__debug__/m/toolbar.js" type="text/javascript" charset="utf-8"></script></body>'), response.content) return response |