Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Revert [5092], since this should only have been applied to newforms-a…

…dmin.

Refs #1576.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@5097 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 4bce3c17ec8ca896e376dc85e02e0288117bcf2a 1 parent 38d8e84
@malcolmt malcolmt authored
Showing with 1 addition and 10 deletions.
  1. +1 −10 django/contrib/admin/views/main.py
View
11 django/contrib/admin/views/main.py
@@ -707,7 +707,6 @@ def get_query_set(self):
# 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
- order_type = self.order_type == 'desc' and '-' or ''
try:
f = self.lookup_opts.get_field(self.order_field, many_to_many=False)
except models.FieldDoesNotExist:
@@ -718,18 +717,10 @@ def get_query_set(self):
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
- if rel_ordering[0] == '-':
- rel_ordering = rel_ordering[1:]
- order_type = not order_type and '-' or ''
lookup_order_field = '%s.%s' % (f.rel.to._meta.db_table, rel_ordering)
- # Must select related because the lookup field may be in a
- # table not otherwise referenced yet.
- # FIXME: Try to remove the need for this in the QuerySet
- # refactor.
- qs = qs.select_related()
# Set ordering.
- qs = qs.order_by('%s%s' % (order_type, lookup_order_field))
+ qs = qs.order_by((self.order_type == 'desc' and '-' or '') + lookup_order_field)
# Apply keyword searches.
def construct_search(field_name):

0 comments on commit 4bce3c1

Please sign in to comment.
Something went wrong with that request. Please try again.