diff options
| author | Nowell Strite | 2008-09-19 01:17:16 -0400 |
|---|---|---|
| committer | Nowell Strite | 2008-09-19 01:17:16 -0400 |
| commit | 43bb25c874f765800076285e76b2b0ba1460a597 (patch) | |
| tree | 0aa718ce9d7979e8bd1e2108ba1568191bea1221 | |
| parent | e40b2c0fbdbd932be5f9d0550a16b6652de0d38d (diff) | |
| download | django-debug-toolbar-43bb25c874f765800076285e76b2b0ba1460a597.tar.bz2 | |
Fixed template panel to skip over debug_toolbar templates. Fixed a bug in template context output where rendering would hang while trying to autoescape the context variable output.
| -rw-r--r-- | debug_toolbar/panels/template.py | 3 | ||||
| -rw-r--r-- | debug_toolbar/templates/debug_toolbar/panels/templates.html | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/debug_toolbar/panels/template.py b/debug_toolbar/panels/template.py index f02b673..bda6630 100644 --- a/debug_toolbar/panels/template.py +++ b/debug_toolbar/panels/template.py @@ -50,6 +50,9 @@ class TemplateDebugPanel(DebugPanel): info = {} # Clean up some info about templates t = d.get('template', None) + # Skip templates that we are generating through the debug toolbar. + if t.name.startswith('debug_toolbar/'): + continue if t.origin and t.origin.name: t.origin_name = t.origin.name else: diff --git a/debug_toolbar/templates/debug_toolbar/panels/templates.html b/debug_toolbar/templates/debug_toolbar/panels/templates.html index ee93708..0c47c5c 100644 --- a/debug_toolbar/templates/debug_toolbar/panels/templates.html +++ b/debug_toolbar/templates/debug_toolbar/panels/templates.html @@ -16,7 +16,7 @@ <dd><samp>{{ template.template.origin_name|addslashes }}</samp></dd> <dd> <div class="djTemplateShowContextDiv"><a class="djTemplateShowContext">Toggle Context</a></div> - <div class="djTemplateHideContextDiv" style="display:none;"><pre>{{ template.context }}</pre></div> + <div class="djTemplateHideContextDiv" style="display:none;"><pre>{{ template.context|safe }}</pre></div> </dd> {% endfor %} </dl> |