summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorTom Carrick <tom@carrick.eu>2023-11-16 09:11:27 +0100
committerNatalia <124304+nessita@users.noreply.github.com>2024-02-05 21:42:04 -0300
commit9cefdfc43f0bae696b56fa5a0bf22346f85affff (patch)
tree3130851ba7b81e7ec5cc8a5467f860344c0547da /django
parent4ade8386ebfeb7a781dc2b62542c1cf5f8b9ddaf (diff)
Refs #10743 -- Enabled ordering for lookups in ModelAdmin.list_display.
Co-authored-by: Natalia <124304+nessita@users.noreply.github.com> Co-authored-by: Nina Menezes <https://github.com/nmenezes0>
Diffstat (limited to 'django')
-rw-r--r--django/contrib/admin/templatetags/admin_list.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/django/contrib/admin/templatetags/admin_list.py b/django/contrib/admin/templatetags/admin_list.py
index 0c32290b6c..fdf6e63f5f 100644
--- a/django/contrib/admin/templatetags/admin_list.py
+++ b/django/contrib/admin/templatetags/admin_list.py
@@ -18,6 +18,7 @@ from django.contrib.admin.views.main import (
)
from django.core.exceptions import ObjectDoesNotExist
from django.db import models
+from django.db.models.constants import LOOKUP_SEP
from django.template import Library
from django.template.loader import get_template
from django.templatetags.static import static
@@ -112,7 +113,7 @@ def result_headers(cl):
# 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", None)
- if not admin_order_field:
+ if not admin_order_field and LOOKUP_SEP not in field_name:
is_field_sortable = False
if not is_field_sortable: