mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-06-05 11:39:13 +00:00
Code Issues 32 Releases Wiki Activity

Fixed #34566 : ModelAdmin get_field_queryset uses related admin ordering, but not related admin querysets.

Browse Source
This commit is contained in:
Krishna2864 2023-11-28 02:39:38 +05:30
parent 729266c6f2
commit 27252c911d
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
django/contrib/admin/options.py
View File

@ -259,11 +259,13 @@ class BaseModelAdmin(metaclass=forms.MediaDefiningClass):
except NotRegistered: except NotRegistered:
return None return None
else: else:
ordering = related_admin.get_ordering(request) if related_admin is not None:
if ordering is not None and ordering != (): ordering = related_admin.get_ordering(request)
return db_field.remote_field.model._default_manager.using(db).order_by( if ordering is not None and ordering != ():
*ordering queryset = related_admin.get_queryset(request)
) if db:
queryset = queryset.using(db)
return queryset.order_by(*ordering)
return None return None
def formfield_for_foreignkey(self, db_field, request, **kwargs): def formfield_for_foreignkey(self, db_field, request, **kwargs):