Ticket #8213: select_related_list.patch

django/contrib/admin/validation.py

@@ -93 +93 @@
                 continue
             _check_field_existsw('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))

django/contrib/admin/views/main.py

@@ -185 +185 @@
         # 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()
+            if isinstance(self.list_select_related, (list, tuple)):
+                related_tables = self.list_select_related
+            else:
+                related_tables = []
+            qs = qs.select_related(*related_tables)
         else:
             for field_name in self.list_display:
                 try: