diff options
| author | Jannis Leidel | 2012-03-31 18:44:05 +0200 |
|---|---|---|
| committer | Jannis Leidel | 2012-03-31 18:44:05 +0200 |
| commit | 6e9142da8f56689899779ebe6248b40c0b3409cf (patch) | |
| tree | af1eb1843c653c779d5f7f1344f10cbd06adb78b /debug_toolbar | |
| parent | 2c7f68d55a6a0c101c41bd23ccb2d0ce9b332e42 (diff) | |
| download | django-debug-toolbar-6e9142da8f56689899779ebe6248b40c0b3409cf.tar.bz2 | |
Fixed merge bugs in the cache panel code.
Diffstat (limited to 'debug_toolbar')
| -rw-r--r-- | debug_toolbar/panels/cache.py | 4 | ||||
| -rw-r--r-- | debug_toolbar/templates/debug_toolbar/panels/cache.html | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/debug_toolbar/panels/cache.py b/debug_toolbar/panels/cache.py index e3b9dad..cb608d0 100644 --- a/debug_toolbar/panels/cache.py +++ b/debug_toolbar/panels/cache.py @@ -125,11 +125,11 @@ class CacheDebugPanel(DebugPanel): return _('Cache: %.2fms') % cache.cache.total_time def nav_subtitle(self): - cache_calls = len(self.cache.calls) + cache_calls = len(cache.cache.calls) return ungettext('%(cache_calls)d call in %(time).2fms', '%(cache_calls)d calls in %(time).2fms', cache_calls) % {'cache_calls': cache_calls, - 'time': self.cache.total_time} + 'time': cache.cache.total_time} def title(self): return _('Cache Usage') diff --git a/debug_toolbar/templates/debug_toolbar/panels/cache.html b/debug_toolbar/templates/debug_toolbar/panels/cache.html index 8576d3c..8104d99 100644 --- a/debug_toolbar/templates/debug_toolbar/panels/cache.html +++ b/debug_toolbar/templates/debug_toolbar/panels/cache.html @@ -38,8 +38,9 @@ <tr> <th>{% trans "Time" %} (ms)</th> <th>{% trans "Type" %}</th> - <th>{% trans "Parameters" %}</th> <th>{% trans "Function" %}</th> + <th>{% trans "args" %}</th> + <th>{% trans "kwargs" %}</th> </tr> </thead> <tbody> @@ -47,8 +48,9 @@ <tr class="{% cycle 'row1' 'row2' %}"> <td>{{ call_time|floatformat:"4" }}</td> <td>{{ call_type|escape }}</td> - <td>{{ call_args|escape }}, {{ call_kwargs|escape }}</td> <td><acronym title="{{ call_func.0 }}:{{ call_func.1 }}">{{ call_func.2|escape }}</acronym>: {{ call_func.3.0|escape }}</td> + <td>{{ call_args|escape }}</td> + <td>{{ call_kwargs|escape }}</td> </tr> {% endfor %} </tbody> |