Ticket #10348: admin_select_related.diff

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

@@ -198 +198 @@
         # 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
+            select_related  = getattr(self.model_admin, 'select_related', None)
+            if select_related == None:
+                select_related = []
+                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):
+                            select_related.append(field_name)
+            if select_related:
+                qs = qs.select_related(*select_related)
 
         # Set ordering.
         if self.order_field: