diff options
| author | Adrian Holovaty <adrian@holovaty.com> | 2007-09-14 04:00:12 +0000 |
|---|---|---|
| committer | Adrian Holovaty <adrian@holovaty.com> | 2007-09-14 04:00:12 +0000 |
| commit | d5ed482d6008c1e5826ab7426e87313e224b4f02 (patch) | |
| tree | 04c5403ec2b03f55cadcad8d9e1f0526e4fb2bfe | |
| parent | 29153bd5b6787cc1a4268f480c2bbc6f7195fd37 (diff) | |
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
| -rw-r--r-- | django/contrib/admin/templates/admin/change_list.html | 2 | ||||
| -rw-r--r-- | 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 @@ <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 %} 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) |