Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed #469 -- Admin changelist no longer assumes ForeignKey has 'orde…

…ring' set when ordering by a ForeignKey field

git-svn-id: http://code.djangoproject.com/svn/django/trunk@693 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 9b68dbf95e10dd9af547176578e0e066aef8bdc5 1 parent 0fa1aa8
@adrianholovaty adrianholovaty authored
Showing with 2 additions and 1 deletion.
  1. +2 −1  django/views/admin/main.py
View
3  django/views/admin/main.py
@@ -130,7 +130,8 @@ def change_list(request, app_label, module_name):
lookup_order_field = order_field
if isinstance(lookup_opts.get_field(order_field).rel, meta.ManyToOne):
f = lookup_opts.get_field(order_field)
- lookup_order_field = '%s.%s' % (f.rel.to.db_table, f.rel.to.ordering[0])
+ rel_ordering = f.rel.to.ordering and f.rel.to.ordering[0] or f.rel.to.pk.column
+ lookup_order_field = '%s.%s' % (f.rel.to.db_table, rel_ordering)
# Use select_related if one of the list_display options is a field with a
# relationship.
for field_name in lookup_opts.admin.list_display:
Please sign in to comment.
Something went wrong with that request. Please try again.