Ticket #10348: 10348_with-none-and-explicit-select-related.diff

django/contrib/admin/validation.py

@@ -127 +127 @@
                 continue
             get_field(cls, model, opts, 'ordering[%d]' % idx, field)
 
-    # list_select_related = False
     # save_as = False
     # save_on_top = False
-    for attr in ('list_select_related', 'save_as', 'save_on_top'):
+    for attr in ('save_as', 'save_on_top'):
         if not isinstance(getattr(cls, attr), bool):
             raise ImproperlyConfigured("'%s.%s' should be a boolean."
                     % (cls.__name__, attr))
 
+    # list_select_related = True, False, None
+    if (not isinstance(cls.list_select_related, bool) and
+            cls.list_select_related is not None):
+        raise ImproperlyConfigured("'%s.list_select_related' should "
+                "be a boolean or None." % cls.__name__)
 
+
     # inlines = []
     if hasattr(cls, 'inlines'):
         check_isseq(cls, 'inlines', cls.inlines)

django/contrib/admin/views/main.py

@@ -200 +200 @@
         # with a relationship.
         if self.list_select_related:
             qs = qs.select_related()
+        elif self.list_select_related is None:
+            pass
         else:
+            select_related = []
             for field_name in self.list_display:
                 try:
                     f = self.lookup_opts.get_field(field_name)
@@ -208 +211 @@
                     pass
                 else:
                     if isinstance(f.rel, models.ManyToOneRel):
-                        qs = qs.select_related()
-                        break
+                        select_related.append(field_name)
+            if select_related:
+                qs = qs.select_related(*select_related)
 
         # Set ordering.
         if self.order_field: