From d5ed482d6008c1e5826ab7426e87313e224b4f02 Mon Sep 17 00:00:00 2001 From: Adrian Holovaty Date: Fri, 14 Sep 2007 04:00:12 +0000 Subject: [PATCH] newforms-admin: Fixed #5424 -- Renamed custom 'filter' template tag so it doesn't conflict with the built-in tag. Thanks, Petr Marhoun git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@6158 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/contrib/admin/templates/admin/change_list.html | 2 +- django/contrib/admin/templatetags/admin_list.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/django/contrib/admin/templates/admin/change_list.html b/django/contrib/admin/templates/admin/change_list.html index 0c1e896717..22acdcc196 100644 --- a/django/contrib/admin/templates/admin/change_list.html +++ b/django/contrib/admin/templates/admin/change_list.html @@ -27,7 +27,7 @@

{% trans 'Filter' %}

{% for spec in cl.filter_specs %} - {% filter cl spec %} + {% admin_list_filter cl spec %} {% endfor %}
{% endif %} diff --git a/django/contrib/admin/templatetags/admin_list.py b/django/contrib/admin/templatetags/admin_list.py index 98843bf26e..4a4c053971 100644 --- a/django/contrib/admin/templatetags/admin_list.py +++ b/django/contrib/admin/templatetags/admin_list.py @@ -277,6 +277,6 @@ def search_form(cl): } search_form = register.inclusion_tag('admin/search_form.html')(search_form) -def filter(cl, spec): +def admin_list_filter(cl, spec): return {'title': spec.title(), 'choices' : list(spec.choices(cl))} -filter = register.inclusion_tag('admin/filter.html')(filter) +admin_list_filter = register.inclusion_tag('admin/filter.html')(admin_list_filter)