mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-31 09:41:08 +00:00
Code Issues 32 Releases Wiki Activity

Fixed #30449 -- Fixed RelatedFieldListFilter/RelatedOnlyFieldListFilter to respect model's Meta.ordering.

Browse Source 
Regression in 6d4e5feb79.

Co-Authored-By: Mariusz Felisiak <felisiak.mariusz@gmail.com>
This commit is contained in:
zeyneloz
2019-08-15 06:54:41 +02:00
committed by Mariusz Felisiak
parent 1f8382d34d
commit 00035672a4
5 changed files with 88 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
django/db/models/fields/__init__.py
View File

@@ -825,9 +825,11 @@ class Field(RegisterLookupMixin):
if hasattr(self.remote_field, 'get_related_field')
else 'pk'
)
qs = rel_model._default_manager.complex_filter(limit_choices_to)
if ordering:
qs = qs.order_by(*ordering)
return (blank_choice if include_blank else []) + [
(choice_func(x), str(x))
for x in rel_model._default_manager.complex_filter(limit_choices_to).order_by(*ordering)
(choice_func(x), str(x)) for x in qs
]
def value_to_string(self, obj):

5
django/db/models/fields/reverse_related.py
View File

@@ -122,8 +122,11 @@ class ForeignObjectRel(FieldCacheMixin):
Analog of django.db.models.fields.Field.get_choices(), provided
initially for utilization by RelatedFieldListFilter.
"""
qs = self.related_model._default_manager.all()
if ordering:
qs = qs.order_by(*ordering)
return (blank_choice if include_blank else []) + [
(x.pk, str(x)) for x in self.related_model._default_manager.order_by(*ordering)
(x.pk, str(x)) for x in qs
]
def is_hidden(self):