Django

Code

Changeset 693

Show
Ignore:
Timestamp:
09/25/05 17:27:23 (3 years ago)
Author:
adrian
Message:

Fixed #469 -- Admin changelist no longer assumes ForeignKey? has 'ordering' set when ordering by a ForeignKey? field

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r674 r693  
    131131    if isinstance(lookup_opts.get_field(order_field).rel, meta.ManyToOne): 
    132132        f = lookup_opts.get_field(order_field) 
    133         lookup_order_field = '%s.%s' % (f.rel.to.db_table, f.rel.to.ordering[0]) 
     133        rel_ordering = f.rel.to.ordering and f.rel.to.ordering[0] or f.rel.to.pk.column 
     134        lookup_order_field = '%s.%s' % (f.rel.to.db_table, rel_ordering) 
    134135    # Use select_related if one of the list_display options is a field with a 
    135136    # relationship.