diff options
| author | Brian Rosner <brosner@gmail.com> | 2008-08-14 20:51:40 +0000 |
|---|---|---|
| committer | Brian Rosner <brosner@gmail.com> | 2008-08-14 20:51:40 +0000 |
| commit | dd0e5fd992986211bdb52b2cdfbd1e232788a20b (patch) | |
| tree | 189071fd712759512bf79d0bd0cbc6036583f147 | |
| parent | b2ec6473c09bcad88194cfb52252c44ed7e960aa (diff) | |
Fixed #8324 -- Corrected the simple case where list_display is not given. Thanks tobias for the quick report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8353 bcc190cf-cafb-0310-a4f2-bffc1f526a37
| -rw-r--r-- | django/contrib/admin/templatetags/admin_list.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/django/contrib/admin/templatetags/admin_list.py b/django/contrib/admin/templatetags/admin_list.py index c837cbe72a..69b27be829 100644 --- a/django/contrib/admin/templatetags/admin_list.py +++ b/django/contrib/admin/templatetags/admin_list.py @@ -70,8 +70,9 @@ pagination = register.inclusion_tag('admin/pagination.html')(pagination) 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 @@ -150,7 +151,8 @@ def items_for_result(cl, result): 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: |