diff --git a/django/contrib/admin/templates/admin/change_list.html b/django/contrib/admin/templates/admin/change_list.html index 693b1f2da8..0c1e896717 100644 --- a/django/contrib/admin/templates/admin/change_list.html +++ b/django/contrib/admin/templates/admin/change_list.html @@ -21,7 +21,18 @@
{% block search %}{% search_form cl %}{% endblock %} {% block date_hierarchy %}{% date_hierarchy cl %}{% endblock %} -{% block filters %}{% filters cl %}{% endblock %} + +{% block filters %} +{% if cl.has_filters %} +
+

{% trans 'Filter' %}

+{% for spec in cl.filter_specs %} + {% filter cl spec %} +{% endfor %} +
+{% endif %} +{% endblock %} + {% block result_list %}{% result_list cl %}{% endblock %} {% block pagination %}{% pagination cl %}{% endblock %}
diff --git a/django/contrib/admin/templates/admin/filters.html b/django/contrib/admin/templates/admin/filters.html deleted file mode 100644 index 3ca763cce3..0000000000 --- a/django/contrib/admin/templates/admin/filters.html +++ /dev/null @@ -1,7 +0,0 @@ -{% load admin_list %} -{% load i18n %} -{% if cl.has_filters %}
-

{% trans 'Filter' %}

-{% for spec in cl.filter_specs %} - {% filter cl spec %} -{% endfor %}
{% endif %} diff --git a/django/contrib/admin/templatetags/admin_list.py b/django/contrib/admin/templatetags/admin_list.py index 86b11c39db..62033025c0 100644 --- a/django/contrib/admin/templatetags/admin_list.py +++ b/django/contrib/admin/templatetags/admin_list.py @@ -264,7 +264,3 @@ search_form = register.inclusion_tag('admin/search_form.html')(search_form) def filter(cl, spec): return {'title': spec.title(), 'choices' : list(spec.choices(cl))} filter = register.inclusion_tag('admin/filter.html')(filter) - -def filters(cl): - return {'cl': cl} -filters = register.inclusion_tag('admin/filters.html')(filters)