Changeset 3794

Timestamp:

09/22/06 08:10:46 (2 years ago)

Author:

mtredinnick

Message:

Fixed #2520 -- Fixed a problem with invalid SQL being generated by admin
interface in certain circumstances. Patch from favo@exoweb.net.

Files:

• django/trunk/AUTHORS (modified) (1 diff)
• django/trunk/django/contrib/admin/views/main.py (modified) (1 diff)

django/trunk/AUTHORS

@@ -73 +73 @@
-    Andy Dustman <farcepest@gmail.com>
-    Clint Ecker
+    favo@exoweb.net
-    gandalf@owca.info
-    Baishampayan Ghose

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

@@ -728 +728 @@
-                or_queries = [models.Q(**{construct_search(field_name): bit}) for field_name in self.lookup_opts.admin.search_fields]
-                other_qs = QuerySet(self.model)
+                if qs._select_related:
+                    other_qs = other_qs.select_related()
-                other_qs = other_qs.filter(reduce(operator.or_, or_queries))
-                qs = qs & other_qs