Django

Code

Changeset 5318

Show
Ignore:
Timestamp:
05/22/07 11:56:53 (1 year ago)
Author:
jacob
Message:

Fixed #3397 (again): admin_order_field is now displayed correctly in the admin views. Thanks, kent37@tds.net

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/trunk/django/contrib/admin/templatetags/admin_list.py

    r5302 r5318  
    7373        try: 
    7474            f = lookup_opts.get_field(field_name) 
     75            admin_order_field = None 
    7576        except models.FieldDoesNotExist: 
    7677            # For non-field list_display values, check for the function 
    …… 
    8788 
    8889            # It is a non-field, but perhaps one that is sortable 
    89             if not getattr(getattr(cl.model, field_name), "admin_order_field", None): 
     90            admin_order_field = getattr(getattr(cl.model, field_name), "admin_order_field", None) 
     91            if not admin_order_field: 
    9092                yield {"text": header} 
    9193                continue 
    …… 
    102104        th_classes = [] 
    103105        new_order_type = 'asc' 
    104         if field_name == cl.order_field: 
     106        if field_name == cl.order_field or admin_order_field == cl.order_field: 
    105107            th_classes.append('sorted %sending' % cl.order_type.lower()) 
    106108            new_order_type = {'asc': 'desc', 'desc': 'asc'}[cl.order_type.lower()]