Skip to content
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

Jump to bottom

Fix displaying instance of RawQuerySet in templates toolbar #326

Merged
merged 1 commit into from Mar 2, 2013
Merged

Fix displaying instance of RawQuerySet in templates toolbar #326

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions debug_toolbar/panels/template.py
View file
Open in desktop
Expand Up @@ -6,7 +6,7 @@
from django.template.context import get_standard_processors from django.template.context import get_standard_processors
from django.test.signals import template_rendered from django.test.signals import template_rendered
from django.utils.translation import ugettext_lazy as _ 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.panels import DebugPanel
from debug_toolbar.utils.tracking.db import recording, SQLQueryTriggered from debug_toolbar.utils.tracking.db import recording, SQLQueryTriggered


Expand Down Expand Up @@ -76,9 +76,9 @@ def _store_template_info(self, sender, **kwargs):
elif key == 'LANGUAGES' and isinstance(value, tuple): elif key == 'LANGUAGES' and isinstance(value, tuple):
temp_layer[key] = '<<languages>>' temp_layer[key] = '<<languages>>'
# QuerySet would trigger the database: user can run the query from SQL Panel # 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__) 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: else:
try: try:
recording(False) recording(False)
Expand Down