Author: adrian
Date: 2007-09-13 23:00:12 -0500 (Thu, 13 Sep 2007)
New Revision: 6158
Modified:
django/branches/newforms-admin/django/contrib/admin/templates/admin/change_list.html
django/branches/newforms-admin/django/contrib/admin/templatetags/admin_list.py
Log:
newforms-admin: Fixed #5424 -- Renamed custom 'filter' template tag so it
doesn't conflict with the built-in tag. Thanks, Petr Marhoun
Modified:
django/branches/newforms-admin/django/contrib/admin/templates/admin/change_list.html
===================================================================
---
django/branches/newforms-admin/django/contrib/admin/templates/admin/change_list.html
2007-09-14 03:54:28 UTC (rev 6157)
+++
django/branches/newforms-admin/django/contrib/admin/templates/admin/change_list.html
2007-09-14 04:00:12 UTC (rev 6158)
@@ -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 %}
Modified:
django/branches/newforms-admin/django/contrib/admin/templatetags/admin_list.py
===================================================================
---
django/branches/newforms-admin/django/contrib/admin/templatetags/admin_list.py
2007-09-14 03:54:28 UTC (rev 6157)
+++
django/branches/newforms-admin/django/contrib/admin/templatetags/admin_list.py
2007-09-14 04:00:12 UTC (rev 6158)
@@ -277,6 +277,6 @@
}
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)
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en
-~----------~----~----~----~------~----~------~--~---
