diff options
| author | Hasan Ramezani <hasan.r67@gmail.com> | 2018-10-19 15:41:29 +0200 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2018-11-14 14:29:39 -0500 |
| commit | 6d4e5feb79f7eabe8a0c7c4b87f25b1a7f87ca0b (patch) | |
| tree | 23294d3f78038e93ad1494ce9957b6e7f29ca2ce /django/contrib/admin | |
| parent | 35a08b8541c856a51b2ab718e0a2fe060debfa2a (diff) | |
Fixed #29835 -- Made RelatedFieldListFilter respect ModelAdmin.ordering.
Diffstat (limited to 'django/contrib/admin')
| -rw-r--r-- | django/contrib/admin/filters.py | 6 |
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 { |