From e78888af2235d39cf3c3e12ecf808f1457a40733 Mon Sep 17 00:00:00 2001 From: Mike J Date: Mon, 15 May 2023 12:08:25 -0600 Subject: [PATCH] Update options.py Fix issues if related_admin has annotations in get_queryset that are used in ordering. --- django/contrib/admin/options.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/django/contrib/admin/options.py b/django/contrib/admin/options.py index b0635669e9..1e65be0795 100644 --- a/django/contrib/admin/options.py +++ b/django/contrib/admin/options.py @@ -250,7 +250,7 @@ class BaseModelAdmin(metaclass=forms.MediaDefiningClass): if related_admin is not None: ordering = related_admin.get_ordering(request) if ordering is not None and ordering != (): - return db_field.remote_field.model._default_manager.using(db).order_by( + return related_admin.get_queryset(request).order_by( *ordering ) return None