Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

newforms-admin: Fixed #5424 -- Renamed custom 'filter' template tag s…

…o 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
  • Loading branch information...
commit d5ed482d6008c1e5826ab7426e87313e224b4f02 1 parent 29153bd
@adrianholovaty adrianholovaty authored
View
2  django/contrib/admin/templates/admin/change_list.html
@@ -27,7 +27,7 @@
<div id="changelist-filter">
<h2>{% trans 'Filter' %}</h2>
{% for spec in cl.filter_specs %}
- {% filter cl spec %}
+ {% admin_list_filter cl spec %}
{% endfor %}
</div>
{% endif %}
View
4 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)
Please sign in to comment.
Something went wrong with that request. Please try again.