aboutsummaryrefslogtreecommitdiffstats
path: root/debug_toolbar/views.py
diff options
context:
space:
mode:
authorAlex Gaynor2009-04-14 21:55:05 -0400
committerAlex Gaynor2009-04-14 21:55:05 -0400
commit4fb76940f33ecd0ec37150659660f8fd4b10550c (patch)
tree711885b1661f82c3c1f653255d74e17f9626f52e /debug_toolbar/views.py
parentf1a18353afd9876bc4f5f642f187581496530039 (diff)
parent04fc096d6b90704d706f4301c846306b068cbb31 (diff)
downloaddjango-debug-toolbar-4fb76940f33ecd0ec37150659660f8fd4b10550c.tar.bz2
Merge commit 'rob/master'
Diffstat (limited to 'debug_toolbar/views.py')
-rw-r--r--debug_toolbar/views.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/debug_toolbar/views.py b/debug_toolbar/views.py
index 0fb4168..9123a00 100644
--- a/debug_toolbar/views.py
+++ b/debug_toolbar/views.py
@@ -18,12 +18,12 @@ class InvalidSQLError(Exception):
self.value = value
def __str__(self):
return repr(self.value)
-
+
def debug_media(request, path):
root = getattr(settings, 'DEBUG_TOOLBAR_MEDIA_ROOT', None)
if root is None:
parent = os.path.abspath(os.path.dirname(__file__))
- root = os.path.join(parent, 'media')
+ root = os.path.join(parent, 'media', 'debug_toolbar')
return django.views.static.serve(request, path, root)
def sql_select(request):