From c2732e6839fffd96b136607f10af95fe58e0de17 Mon Sep 17 00:00:00 2001 From: zeyneloz Date: Thu, 15 Aug 2019 06:54:41 +0200 Subject: [2.2.x] Fixed #30449 -- Fixed RelatedFieldListFilter/RelatedOnlyFieldListFilter to respect model's Meta.ordering. Regression in 6d4e5feb79f7eabe8a0c7c4b87f25b1a7f87ca0b. Co-Authored-By: Mariusz Felisiak Backport of 00035672a460b6eb5442d2837bc783f8af28c6f3 from master --- tests/model_fields/tests.py | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) (limited to 'tests/model_fields') diff --git a/tests/model_fields/tests.py b/tests/model_fields/tests.py index 42e784db54..9e38f0fcf0 100644 --- a/tests/model_fields/tests.py +++ b/tests/model_fields/tests.py @@ -163,9 +163,9 @@ class GetChoicesOrderingTests(TestCase): @classmethod def setUpTestData(cls): - cls.foo1 = Foo.objects.create(a='a', d='12.34') + cls.foo1 = Foo.objects.create(a='a', d='12.35') cls.foo2 = Foo.objects.create(a='b', d='12.34') - cls.bar1 = Bar.objects.create(a=cls.foo1, b='a') + cls.bar1 = Bar.objects.create(a=cls.foo1, b='b') cls.bar2 = Bar.objects.create(a=cls.foo2, b='a') cls.field = Bar._meta.get_field('a') @@ -182,6 +182,14 @@ class GetChoicesOrderingTests(TestCase): [self.foo2, self.foo1] ) + def test_get_choices_default_ordering(self): + self.addCleanup(setattr, Foo._meta, 'ordering', Foo._meta.ordering) + Foo._meta.ordering = ('d',) + self.assertChoicesEqual( + self.field.get_choices(include_blank=False), + [self.foo2, self.foo1] + ) + def test_get_choices_reverse_related_field(self): self.assertChoicesEqual( self.field.remote_field.get_choices(include_blank=False, ordering=('a',)), @@ -191,3 +199,11 @@ class GetChoicesOrderingTests(TestCase): self.field.remote_field.get_choices(include_blank=False, ordering=('-a',)), [self.bar2, self.bar1] ) + + def test_get_choices_reverse_related_field_default_ordering(self): + self.addCleanup(setattr, Bar._meta, 'ordering', Bar._meta.ordering) + Bar._meta.ordering = ('b',) + self.assertChoicesEqual( + self.field.remote_field.get_choices(include_blank=False), + [self.bar2, self.bar1] + ) -- cgit v1.3