summaryrefslogtreecommitdiff
path: root/django/contrib/admin
diff options
context:
space:
mode:
Diffstat (limited to 'django/contrib/admin')
-rw-r--r--django/contrib/admin/filters.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/django/contrib/admin/filters.py b/django/contrib/admin/filters.py
index 7cf75bcd0d..d65e01d5e2 100644
--- a/django/contrib/admin/filters.py
+++ b/django/contrib/admin/filters.py
@@ -194,7 +194,11 @@ class RelatedFieldListFilter(FieldListFilter):
return [self.lookup_kwarg, self.lookup_kwarg_isnull]
def field_choices(self, field, request, model_admin):
- return field.get_choices(include_blank=False)
+ ordering = ()
+ related_admin = model_admin.admin_site._registry.get(field.remote_field.model)
+ if related_admin is not None:
+ ordering = related_admin.get_ordering(request)
+ return field.get_choices(include_blank=False, ordering=ordering)
def choices(self, changelist):
yield {