aboutsummaryrefslogtreecommitdiffstats
path: root/debug_toolbar
diff options
context:
space:
mode:
authorJannis Leidel2013-03-02 05:17:48 -0800
committerJannis Leidel2013-03-02 05:17:48 -0800
commitc38449c4f63996beab99abce20523cd5f8ae91c0 (patch)
treec65b6b35a902e3fb3b11f8311d9b8503cb7a1e3c /debug_toolbar
parentd85ad8151951d28fac6aec43ee75639cd6961342 (diff)
parent9c2a8c539823f258a77024af180513c584538204 (diff)
downloaddjango-debug-toolbar-c38449c4f63996beab99abce20523cd5f8ae91c0.tar.bz2
Merge pull request #326 from maizy/fix-raw-query-set-in-tpl
Fix displaying instance of RawQuerySet in templates toolbar
Diffstat (limited to 'debug_toolbar')
-rw-r--r--debug_toolbar/panels/template.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/debug_toolbar/panels/template.py b/debug_toolbar/panels/template.py
index 48225a0..390c1e1 100644
--- a/debug_toolbar/panels/template.py
+++ b/debug_toolbar/panels/template.py
@@ -6,7 +6,7 @@ from django.conf import settings
from django.template.context import get_standard_processors
from django.test.signals import template_rendered
from django.utils.translation import ugettext_lazy as _
-from django.db.models.query import QuerySet
+from django.db.models.query import QuerySet, RawQuerySet
from debug_toolbar.panels import DebugPanel
from debug_toolbar.utils.tracking.db import recording, SQLQueryTriggered
@@ -76,9 +76,9 @@ class TemplateDebugPanel(DebugPanel):
elif key == 'LANGUAGES' and isinstance(value, tuple):
temp_layer[key] = '<<languages>>'
# QuerySet would trigger the database: user can run the query from SQL Panel
- elif isinstance(value, QuerySet):
+ elif isinstance(value, (QuerySet, RawQuerySet)):
model_name = "%s.%s" % (value.model._meta.app_label, value.model.__name__)
- temp_layer[key] = '<<queryset of %s>>' % model_name
+ temp_layer[key] = '<<%s of %s>>' % (value.__class__.__name__.lower(), model_name)
else:
try:
recording(False)