Ticket #917: change_list_template_overloading.patch

django/contrib/admin/templates/admin/change_list.html

@@ +1 @@
+{% extends "admin/base_site" %}
 {% load adminmedia admin_list i18n %}
-{% extends "admin/base_site" %}
 {% block bodyclass %}change-list{% endblock %}
 {% if not is_popup %}{% block breadcrumbs %}<div class="breadcrumbs"><a href="../../">{% trans "Home" %}</a> &rsaquo; {{ cl.opts.verbose_name_plural|capfirst }} </div>{% endblock %}{% endif %}
 {% block coltype %}flex{% endblock %}
@@ -9 +9 @@
 <ul class="object-tools"><li><a href="add/{% if is_popup %}?_popup=1{% endif %}" class="addlink">{% blocktrans with cl.opts.verbose_name as name %}Add {{ name }}{% endblocktrans %}</a></li></ul>
 {% endif %}
 <div class="module{% if cl.has_filters %} filtered{% endif %}" id="changelist">
-{% search_form cl %}
-{% date_hierarchy cl %}
-{% filters cl %}
-{% result_list cl %}
-{% pagination cl %}
+{% block search %}{% search_form cl %}{%endblock%}
+{% block date_hierarchy %}{% date_hierarchy cl %}{%endblock%}
+{% block filters %}{% filters cl %}{%endblock%}
+{% block result_list %}{% result_list cl %}{%endblock%}
+{% block pagination %}{% pagination cl %}{%endblock%}
 </div>
 </div>
 {% endblock %}

django/contrib/admin/views/main.py

@@ -242 +242 @@
         'cl' : cl
     })
     c.update( { 'has_add_permission': c['perms'][app_label][cl.opts.get_add_permission()]}),
-    return render_to_response('admin/change_list',
+    return render_to_response(["admin/%s/%s/change_list" % (app_label, cl.opts.object_name.lower() ),
+                               "admin/%s/change_list" % app_label ,
+                               "admin/change_list" ],
                                context_instance = c)
 change_list = staff_member_required(change_list)