Django

Code

Changeset 1468

Show
Ignore:
Timestamp:
11/27/05 14:25:56 (3 years ago)
Author:
adrian
Message:

Fixed #917 -- Made admin change_list view overridable by custom templates

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r1467 r1468  
    1010{% endif %} 
    1111<div class="module{% if cl.has_filters %} filtered{% endif %}" id="changelist"> 
    12 {% search_form cl %} 
    13 {% date_hierarchy cl %} 
    14 {% filters cl %} 
    15 {% result_list cl %} 
    16 {% pagination cl %} 
     12{% block search %}{% search_form cl %}{% endblock %} 
     13{% block date_hierarchy %}{% date_hierarchy cl %}{% endblock %} 
     14{% block filters %}{% filters cl %}{% endblock %} 
     15{% block result_list %}{% result_list cl %}{% endblock %} 
     16{% block pagination %}{% pagination cl %}{% endblock %} 
    1717</div> 
    1818</div> 

  • django/trunk/django/contrib/admin/views/main.py

    r1438 r1468  
    242242        'cl' : cl 
    243243    }) 
    244     c.update( { 'has_add_permission': c['perms'][app_label][cl.opts.get_add_permission()]}), 
    245     return render_to_response('admin/change_list', 
    246                                context_instance = c) 
     244    c.update({'has_add_permission': c['perms'][app_label][cl.opts.get_add_permission()]}), 
     245    return render_to_response(['admin/%s/%s/change_list' % (app_label, cl.opts.object_name.lower()), 
     246                               'admin/%s/change_list' % app_label, 
     247                               'admin/change_list'], context_instance=c) 
    247248change_list = staff_member_required(change_list) 
    248249 
    249  
    250250use_raw_id_admin = lambda field: isinstance(field.rel, (meta.ManyToOne, meta.ManyToMany)) and field.rel.raw_id_admin 
    251  
    252251 
    253252def get_javascript_imports(opts,auto_populated_fields, ordered_objects, field_sets):