Ticket #10348: 10348-introspect-qs.diff

django/contrib/admin/views/main.py

@@ -197 +197 @@
             raise IncorrectLookupParameters
 
         # Use select_related() if one of the list_display options is a field
-        # with a relationship.
-        if self.list_select_related:
-            qs = qs.select_related()
-        else:
-            for field_name in self.list_display:
-                try:
-                    f = self.lookup_opts.get_field(field_name)
-                except models.FieldDoesNotExist:
-                    pass
-                else:
-                    if isinstance(f.rel, models.ManyToOneRel):
-                        qs = qs.select_related()
-                        break
+        # with a relationship, but only if the queryset doesn't already have
+        # select_related set.  (If ModelAdmin.queryset was overridden with
+        # different select_related() paramaters we want to preserve them.)
+        if not qs.query.select_related:
+            if self.list_select_related:
+                qs = qs.select_related()
+            else:
+                for field_name in self.list_display:
+                    try:
+                        f = self.lookup_opts.get_field(field_name)
+                    except models.FieldDoesNotExist:
+                        pass
+                    else:
+                        if isinstance(f.rel, models.ManyToOneRel):
+                            qs = qs.select_related()
+                            break
 
         # Set ordering.
         if self.order_field:

tests/regressiontests/admin_views/tests.py

@@ -11 +11 @@
 from django.contrib.admin.util import quote
 from django.contrib.admin.helpers import ACTION_CHECKBOX_NAME
 from django.utils.html import escape
+from django.contrib.admin.views.main import ChangeList
 
 # local test models
-from models import Article, CustomArticle, Section, ModelWithStringPrimaryKey, Person, Persona, FooAccount, BarAccount, Subscriber, ExternalSubscriber, Podcast, EmptyModel
+from models import Article, CustomArticle, Section, ModelWithStringPrimaryKey, Person, Persona, FooAccount, BarAccount, Subscriber, ExternalSubscriber, Podcast, EmptyModel, ChildAdmin, Child
 
 try:
     set
@@ -1062 +1063 @@
                 self.assertEqual(response.status_code, 200)
             else:
                 self.assertEqual(response.status_code, 404)
+
+    def test_select_related_preserved(self):
+        from django.contrib.admin import site
+        m = ChildAdmin(Child, site)
+        class MockRequest(object):
+            GET = {}
+        cl = ChangeList(MockRequest(), Child, m.list_display, m.list_display_links, 
+                m.list_filter,m.date_hierarchy, m.search_fields, 
+                m.list_select_related, m.list_per_page, m.list_editable,
+                m)
+        self.assertEqual(cl.query_set.query.select_related, {'parent': {'name': {}}})
+

tests/regressiontests/admin_views/models.py

@@ -280 +280 @@
     model = Parent
     inlines = [ChildInline]
 
+class ChildAdmin(admin.ModelAdmin):
+    model = Child
+    list_display = ['name', 'parent']
+    def queryset(self, request):
+        return super(ChildAdmin, self).queryset(request).select_related("parent__name")
+
 class EmptyModel(models.Model):
     def __unicode__(self):
         return "Primary key = %s" % self.id