Ticket #9654: respect-empty-list_display_links.diff

django/contrib/admin/validation.py

@@ -42 +42 @@
                                 % (cls.__name__, idx, field))
 
     # list_display_links
-    if hasattr(cls, 'list_display_links'):
+    if hasattr(cls, 'list_display_links') and cls.list_display_links is not None:
         check_isseq(cls, 'list_display_links', cls.list_display_links)
         for idx, field in enumerate(cls.list_display_links):
             fetch_attr(cls, model, opts, 'list_display_links[%d]' % idx, field)

django/contrib/admin/options.py

@@ -156 +156 @@
     __metaclass__ = forms.MediaDefiningClass
 
     list_display = ('__str__',)
-    list_display_links = ()
+    list_display_links = None
     list_filter = ()
     list_select_related = False
     list_per_page = 100

django/contrib/admin/templatetags/admin_list.py

@@ -212 +212 @@
         if force_unicode(result_repr) == '':
             result_repr = mark_safe(' ')
         # If list_display_links not defined, add the link tag to the first field
-        if (first and not cl.list_display_links) or field_name in cl.list_display_links:
+        if (first and cl.list_display_links is None) or (cl.list_display_links and field_name in cl.list_display_links):
             table_tag = {True:'th', False:'td'}[first]
             first = False
             url = cl.url_for_result(result)