Anonymous avatar Anonymous committed 49ce166

Fixed #8324 -- Corrected the simple case where list_display is not given. Thanks tobias for the quick report.

Comments (0)

Files changed (1)

django/contrib/admin/templatetags/admin_list.py

 
 def result_headers(cl):
     lookup_opts = cl.lookup_opts
-
+    
     for i, field_name in enumerate(cl.list_display):
+        attr = None
         try:
             f = lookup_opts.get_field(field_name)
             admin_order_field = None
                 if callable(field_name):
                     attr = field_name
                     value = attr(result)
-                elif hasattr(cl.model_admin, field_name):
+                elif hasattr(cl.model_admin, field_name) and \
+                   not field_name == '__str__' and not field_name == '__unicode__':
                     attr = getattr(cl.model_admin, field_name)
                     value = attr(result)
                 else:
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.