innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Revert [5092], since this should only have been applied to newforms-admin. 

Refs #1576.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@5097 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Malcolm Tredinnick 2007-04-26 14:58:38 +00:00
parent 38d8e84248
commit 4bce3c17ec
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
django/contrib/admin/views/main.py
View File

@ -707,7 +707,6 @@ class ChangeList(object):
# If the order-by field is a field with a relationship, order by the # If the order-by field is a field with a relationship, order by the
# value in the related table. # value in the related table.
lookup_order_field = self.order_field lookup_order_field = self.order_field
order_type = self.order_type == 'desc' and '-' or ''
try: try:
f = self.lookup_opts.get_field(self.order_field, many_to_many=False) f = self.lookup_opts.get_field(self.order_field, many_to_many=False)
except models.FieldDoesNotExist: except models.FieldDoesNotExist:
@ -718,18 +717,10 @@ class ChangeList(object):
pass pass
elif isinstance(f.rel, models.ManyToOneRel): 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 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) 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. # 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. # Apply keyword searches.
def construct_search(field_name): def construct_search(field_name):