Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed #3002 -- Fixed a problem with ordering by related models in the…

… admin

interface. Patch from Ramiro Morales.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@7491 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit a1e4b15f15d7807ddd35c0172b738a6e399235f6 1 parent 356dfd5
Malcolm Tredinnick malcolmt authored
Showing with 2 additions and 17 deletions.
  1. +2 −17 django/contrib/admin/views/main.py
19 django/contrib/admin/views/main.py
View
@@ -716,24 +716,9 @@ def get_query_set(self):
qs = qs.select_related()
break
- # Calculate lookup_order_field.
- # If the order-by field is a field with a relationship, order by the
- # value in the related table.
- lookup_order_field = self.order_field
- try:
- f = self.lookup_opts.get_field(self.order_field, many_to_many=False)
- except models.FieldDoesNotExist:
- pass
- else:
- if isinstance(f.rel, models.OneToOneRel):
- # For OneToOneFields, don't try to order by the related object's ordering criteria.
- pass
- elif isinstance(f.rel, models.ManyToOneRel):
- rel_ordering = f.rel.to._meta.ordering and f.rel.to._meta.ordering[0] or f.rel.to._meta.pk.column
- lookup_order_field = '%s.%s' % (f.rel.to._meta.db_table, rel_ordering)
-
# Set ordering.
- qs = qs.order_by((self.order_type == 'desc' and '-' or '') + lookup_order_field)
+ if self.order_field:
+ qs = qs.order_by('%s%s' % ((self.order_type == 'desc' and '-' or ''), self.order_field))
# Apply keyword searches.
def construct_search(field_name):
Please sign in to comment.
Something went wrong with that request. Please try again.