From 27252c911d706b278299f7fcc0947c79b913fd0d Mon Sep 17 00:00:00 2001 From: Krishna2864 Date: Tue, 28 Nov 2023 02:39:38 +0530 Subject: [PATCH] Fixed #34566 : ModelAdmin get_field_queryset uses related admin ordering, but not related admin querysets. --- django/contrib/admin/options.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/django/contrib/admin/options.py b/django/contrib/admin/options.py index b045b2df02..4f4c78d604 100644 --- a/django/contrib/admin/options.py +++ b/django/contrib/admin/options.py @@ -259,11 +259,13 @@ class BaseModelAdmin(metaclass=forms.MediaDefiningClass): except NotRegistered: return None else: - 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( - *ordering - ) + if related_admin is not None: + ordering = related_admin.get_ordering(request) + if ordering is not None and ordering != (): + queryset = related_admin.get_queryset(request) + if db: + queryset = queryset.using(db) + return queryset.order_by(*ordering) return None def formfield_for_foreignkey(self, db_field, request, **kwargs):