From 1e70426619ea512e6792a5b5adf6740fa8fb1cc6 Mon Sep 17 00:00:00 2001 From: Jacob Kaplan-Moss Date: Tue, 22 May 2007 16:56:53 +0000 Subject: [PATCH] Fixed #3397 (again): admin_order_field is now displayed correctly in the admin views. Thanks, kent37@tds.net git-svn-id: http://code.djangoproject.com/svn/django/trunk@5318 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/contrib/admin/templatetags/admin_list.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/django/contrib/admin/templatetags/admin_list.py b/django/contrib/admin/templatetags/admin_list.py index 0bf18d86cc..7ad66c250d 100644 --- a/django/contrib/admin/templatetags/admin_list.py +++ b/django/contrib/admin/templatetags/admin_list.py @@ -72,6 +72,7 @@ def result_headers(cl): for i, field_name in enumerate(lookup_opts.admin.list_display): try: f = lookup_opts.get_field(field_name) + admin_order_field = None except models.FieldDoesNotExist: # For non-field list_display values, check for the function # attribute "short_description". If that doesn't exist, fall @@ -86,7 +87,8 @@ def result_headers(cl): header = field_name.replace('_', ' ') # It is a non-field, but perhaps one that is sortable - if not getattr(getattr(cl.model, field_name), "admin_order_field", None): + admin_order_field = getattr(getattr(cl.model, field_name), "admin_order_field", None) + if not admin_order_field: yield {"text": header} continue @@ -101,7 +103,7 @@ def result_headers(cl): th_classes = [] new_order_type = 'asc' - if field_name == cl.order_field: + if field_name == cl.order_field or admin_order_field == cl.order_field: th_classes.append('sorted %sending' % cl.order_type.lower()) new_order_type = {'asc': 'desc', 'desc': 'asc'}[cl.order_type.lower()]