diff options
| author | Adrian Holovaty <adrian@holovaty.com> | 2005-11-27 20:25:56 +0000 |
|---|---|---|
| committer | Adrian Holovaty <adrian@holovaty.com> | 2005-11-27 20:25:56 +0000 |
| commit | 6a36699818e9c90edc0acfdb026522dcf913ba58 (patch) | |
| tree | bcdb272e0597eef1962aca43caf0348fb9500e77 | |
| parent | 4cdaf74cec3ef1192b5bd71b56d0ec11810f8fdf (diff) | |
Fixed #917 -- Made admin change_list view overridable by custom templates
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1468 bcc190cf-cafb-0310-a4f2-bffc1f526a37
| -rw-r--r-- | django/contrib/admin/templates/admin/change_list.html | 10 | ||||
| -rw-r--r-- | django/contrib/admin/views/main.py | 9 |
2 files changed, 9 insertions, 10 deletions
diff --git a/django/contrib/admin/templates/admin/change_list.html b/django/contrib/admin/templates/admin/change_list.html index b2b680add4..188b0639e7 100644 --- a/django/contrib/admin/templates/admin/change_list.html +++ b/django/contrib/admin/templates/admin/change_list.html @@ -9,11 +9,11 @@ <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 %} diff --git a/django/contrib/admin/views/main.py b/django/contrib/admin/views/main.py index 0c1baccc65..584b08af93 100644 --- a/django/contrib/admin/views/main.py +++ b/django/contrib/admin/views/main.py @@ -241,15 +241,14 @@ def change_list(request, app_label, module_name): 'is_popup': cl.is_popup, 'cl' : cl }) - c.update( { 'has_add_permission': c['perms'][app_label][cl.opts.get_add_permission()]}), - return render_to_response('admin/change_list', - context_instance = c) + c.update({'has_add_permission': c['perms'][app_label][cl.opts.get_add_permission()]}), + 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) - use_raw_id_admin = lambda field: isinstance(field.rel, (meta.ManyToOne, meta.ManyToMany)) and field.rel.raw_id_admin - def get_javascript_imports(opts,auto_populated_fields, ordered_objects, field_sets): # Put in any necessary JavaScript imports. js = ['js/core.js', 'js/admin/RelatedObjectLookups.js'] |