diff --git a/django/contrib/admin/templatetags/admin_list.py b/django/contrib/admin/templatetags/admin_list.py
index fdf082b..6db04a5 100644
|
a
|
b
|
def items_for_result(cl, result, form):
|
| 135 | 135 | row_class = '' |
| 136 | 136 | try: |
| 137 | 137 | f, attr, value = lookup_field(field_name, result, cl.model_admin) |
| 138 | | except (AttributeError, ObjectDoesNotExist): |
| | 138 | except ObjectDoesNotExist: |
| 139 | 139 | result_repr = EMPTY_CHANGELIST_VALUE |
| 140 | 140 | else: |
| 141 | 141 | if f is None: |
diff --git a/tests/regressiontests/admin_views/models.py b/tests/regressiontests/admin_views/models.py
index b65f8a4..032ea1f 100644
|
a
|
b
|
class ChapterXtra2(models.Model):
|
| 80 | 80 | def __unicode__(self): |
| 81 | 81 | return u'¿Xtra2: %s' % self.xtra |
| 82 | 82 | |
| 83 | | def callable_year(dt_value): |
| 84 | | return dt_value.year |
| | 83 | def callable_year(obj): |
| | 84 | return obj.model_year() |
| 85 | 85 | callable_year.admin_order_field = 'date' |
| 86 | 86 | |
| 87 | 87 | class ArticleInline(admin.TabularInline): |