From 7cbcf2e2cbca1acfccfd973f746a9e6abfc0052e Mon Sep 17 00:00:00 2001 From: Mariusz Felisiak Date: Mon, 1 Apr 2019 15:11:54 +0200 Subject: Fixed #30259 -- Fixed crash of admin views when properties don't have admin_order_field attribute. --- django/contrib/admin/templatetags/admin_list.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'django') diff --git a/django/contrib/admin/templatetags/admin_list.py b/django/contrib/admin/templatetags/admin_list.py index fe4249ae5b..4fd9c45a57 100644 --- a/django/contrib/admin/templatetags/admin_list.py +++ b/django/contrib/admin/templatetags/admin_list.py @@ -130,7 +130,7 @@ def result_headers(cl): admin_order_field = getattr(attr, "admin_order_field", None) # Set ordering for attr that is a property, if defined. if isinstance(attr, property) and hasattr(attr, 'fget'): - admin_order_field = getattr(attr.fget, 'admin_order_field') + admin_order_field = getattr(attr.fget, 'admin_order_field', None) if not admin_order_field: is_field_sortable = False -- cgit v1.3