From 886f07dc0a349cd9bfdeb84dc43f8de221e90d0e Mon Sep 17 00:00:00 2001 From: Adam Haney Date: Thu, 16 May 2013 00:57:12 +0000 Subject: [PATCH 1/2] * Using getattr to better handle an edge case where we threw an exception trying to get the app name --- debug_toolbar/panels/template.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/debug_toolbar/panels/template.py b/debug_toolbar/panels/template.py index 390c1e15d..cc7fd0d8a 100644 --- a/debug_toolbar/panels/template.py +++ b/debug_toolbar/panels/template.py @@ -77,7 +77,9 @@ def _store_template_info(self, sender, **kwargs): temp_layer[key] = '<>' # QuerySet would trigger the database: user can run the query from SQL Panel elif isinstance(value, (QuerySet, RawQuerySet)): - model_name = "%s.%s" % (value.model._meta.app_label, value.model.__name__) + model_meta = getattr(value.model, "_meta", "") + app_level = getattr(model_meta, "app_label", "") + model_name = "%s.%s" % (app_label, value.model.__name__) temp_layer[key] = '<<%s of %s>>' % (value.__class__.__name__.lower(), model_name) else: try: From e2f3f723abc680ab2578a222a41abf8025558876 Mon Sep 17 00:00:00 2001 From: Adam Haney Date: Thu, 16 May 2013 18:36:32 +0000 Subject: [PATCH 2/2] * Fixing typo --- debug_toolbar/panels/template.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debug_toolbar/panels/template.py b/debug_toolbar/panels/template.py index cc7fd0d8a..0440af181 100644 --- a/debug_toolbar/panels/template.py +++ b/debug_toolbar/panels/template.py @@ -78,7 +78,7 @@ def _store_template_info(self, sender, **kwargs): # QuerySet would trigger the database: user can run the query from SQL Panel elif isinstance(value, (QuerySet, RawQuerySet)): model_meta = getattr(value.model, "_meta", "") - app_level = getattr(model_meta, "app_label", "") + app_label = getattr(model_meta, "app_label", "") model_name = "%s.%s" % (app_label, value.model.__name__) temp_layer[key] = '<<%s of %s>>' % (value.__class__.__name__.lower(), model_name) else: