Better substitutions for template context variables triggering SQL queries

2 files changed, 5 insertions, 4 deletions

diff --git a/debug_toolbar/panels/template.py b/debug_toolbar/panels/template.py
index ff8cd15..7ff3dc6 100644
--- a/debug_toolbar/panels/template.py
+++ b/debug_toolbar/panels/template.py
@@ -70,13 +70,14 @@ class TemplateDebugPanel(DebugPanel):
                         temp_layer[key] = '<<languages>>'
                     # QuerySet would trigger the database: user can run the query from SQL Panel
                     elif isinstance(value, QuerySet):
-                        temp_layer[key] = '<<queryset>>'
+                        model_name = "%s.%s" % (value.model._meta.app_label, value.model.__name__)
+                        temp_layer[key] = '<<queryset of %s>>' % model_name
                     else:
                         try:
                             recording(False)
                             pformat(value)  # this MAY trigger a db query
                         except SQLQueryTriggered:
-                            temp_layer[key] = '<<contains queryset>>'
+                            temp_layer[key] = '<<triggers database query>>'
                         else:
                             temp_layer[key] = value
                         finally:
diff --git a/tests/tests.py b/tests/tests.py
index 5a52670..c074c23 100644
--- a/tests/tests.py
+++ b/tests/tests.py
@@ -207,8 +207,8 @@ class TemplatePanelTestCase(BaseTestCase):
         self.assertEquals(len(sql_panel._queries), 0)
         ctx = template_panel.templates[0]['context'][0]
         ctx = eval(ctx) # convert back to Python
-        self.assertEquals(ctx['queryset'], '<<queryset>>')
-        self.assertEquals(ctx['deep_queryset'], '<<contains queryset>>')
+        self.assertEquals(ctx['queryset'], '<<queryset of auth.User>>')
+        self.assertEquals(ctx['deep_queryset'], '<<triggers database query>>')
 
 def module_func(*args, **kwargs):
     """Used by dispatch tests"""