Skip to content

A fix for projects that override request.urlconf in custom middleware. #136

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

A fix for projects that override request.urlconf in custom middleware. #136

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions debug_toolbar/middleware.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
Debug Toolbar middleware
"""
import os
import sys

from django.conf import settings
from django.http import HttpResponseRedirect
Expand Down Expand Up @@ -33,7 +34,6 @@ class DebugToolbarMiddleware(object):
"""
def __init__(self):
self.debug_toolbars = {}
self.override_url = True

# Set method to use to decide to show toolbar
self.show_toolbar = self._show_toolbar # default
Expand Down Expand Up @@ -66,13 +66,12 @@ def _show_toolbar(self, request):

def process_request(self, request):
if self.show_toolbar(request):
if self.override_url:
original_urlconf = getattr(request, 'urlconf', settings.ROOT_URLCONF)
debug_toolbar.urls.urlpatterns += patterns('',
('', include(original_urlconf)),
)
self.override_url = False
request.urlconf = 'debug_toolbar.urls'
urlconf = getattr(request, 'urlconf', settings.ROOT_URLCONF)
__import__(urlconf)
module = sys.modules[urlconf]
if not getattr(module, 'DEBUGGER_INSTALLED', False):
module.urlpatterns += debug_toolbar.urls.urlpatterns
module.DEBUGGER_INSTALLED = True

self.debug_toolbars[request] = DebugToolbar(request)
for panel in self.debug_toolbars[request].panels:
Expand Down