diff options
| author | Mariusz Felisiak <felisiak.mariusz@gmail.com> | 2019-04-01 15:11:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-01 15:11:54 +0200 |
| commit | 7cbcf2e2cbca1acfccfd973f746a9e6abfc0052e (patch) | |
| tree | b1872a31250529897a367910e582c9e42a75f2b7 /django | |
| parent | 93daed25a41b5cf2f7804d91630caa1cd0786a9a (diff) | |
Fixed #30259 -- Fixed crash of admin views when properties don't have admin_order_field attribute.
Diffstat (limited to 'django')
| -rw-r--r-- | django/contrib/admin/templatetags/admin_list.py | 2 |
1 files changed, 1 insertions, 1 deletions
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 |