Changeset 5092

Timestamp:

04/26/07 08:48:31 (2 years ago)

Author:

mtredinnick

Message:

Fixed #1576 -- Fixed incorrect SQL generated when using descending ordering
from related models. Patch from SmileyChris?.

Files:

• django/trunk/django/contrib/admin/views/main.py (modified) (2 diffs)

django/trunk/django/contrib/admin/views/main.py

@@ -708 +708 @@
-        # 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)
@@ -718 +719 @@
-            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.
-(self.order_type == 'desc' and '-' or '') + lookup_order_field
+'%s%s' % (order_type, lookup_order_field)
-
-        # Apply keyword searches.