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

zeyneloz · 2019-05-22T11:30:39Z

Refactored admin.RelatedFieldListFilter and admin.RelatedOnlyFieldListFilter
to respect ordering defined in related model admin. Refactored
Field.get_choices to fallback to default model ordering.

gauravtoshniwal1989

Minor comments around checking the existence of ordering before applying it on the QuerySet in get_choices.
PS: Please forgive my naivety if it seems like that. It's my first review on the Django project.

django/db/models/fields/__init__.py

django/db/models/fields/reverse_related.py

felixxm

@zeyneloz Thanks for this patch 👍 I left some comment. Can you also split your changes into two commits

1st with adding get_field_ordering() hook, and
2nd with fix and tests.

django/db/models/fields/reverse_related.py

tests/admin_filters/models.py

tests/admin_filters/tests.py

zeyneloz · 2019-06-13T18:48:46Z

@felixxm Thanks for the comments. I tried to avoid adding extra models for tests but I had to add two new ones otherwise it would have broken existing test cases. Can you review the new commits, If everything is okay, I can revamp the commits then.

felixxm

@zeyneloz Thanks! Please add release notes (2.2.5.txt) and take a look at tests in an alternative PR #11661 they are simpler, looks sufficient and don't add new models.

zeyneloz · 2019-08-13T10:01:07Z

@zeyneloz Thanks! Please add release notes (2.2.5.txt) and take a look at tests in an alternative PR #11661 they are simpler, looks sufficient and don't add new models.

Thanks @felixxm . I added the release note.
I also checked alternative PR but there are not enough tests in it. I had to introduce new models to cover all test cases, without breaking existing ones (and to make it more readable/predictable). Anybody is more than welcome to revamp the tests of this PR if they can make them without new models, since I don't have any free time to look into it this week.

felixxm · 2019-08-15T08:17:54Z

@zeyneloz Thanks! I changed tests and moved a regression fix to a separate commit.

…er to respect model's Meta.ordering. Regression in 6d4e5fe. Co-Authored-By: Mariusz Felisiak <felisiak.mariusz@gmail.com>

…ering.

gauravtoshniwal1989 reviewed May 24, 2019

View reviewed changes

django/db/models/fields/__init__.py Show resolved Hide resolved

django/db/models/fields/reverse_related.py Outdated Show resolved Hide resolved

felixxm reviewed Jun 4, 2019

View reviewed changes

zeyneloz force-pushed the ticket_30449 branch from 6b01101 to 29a89cd Compare June 13, 2019 18:39

felixxm reviewed Aug 13, 2019

View reviewed changes

zeyneloz force-pushed the ticket_30449 branch from 9d75df9 to 66867db Compare August 13, 2019 09:53

zeyneloz force-pushed the ticket_30449 branch from 66867db to b435a61 Compare August 13, 2019 10:59

felixxm self-assigned this Aug 15, 2019

felixxm force-pushed the ticket_30449 branch from b435a61 to 87cc033 Compare August 15, 2019 08:13

felixxm changed the title ~~Fixed #30449 -- Fixed ordering of admin.RelatedFieldListFilter.~~ Fixed #30449 -- Fixed RelatedFieldListFilter/RelatedOnlyFieldListFilter to respect model's Meta.ordering. Aug 15, 2019

zeyneloz and others added 2 commits August 15, 2019 10:29

Fixed #30449 -- Fixed RelatedFieldListFilter/RelatedOnlyFieldListFilt…

0003567

…er to respect model's Meta.ordering. Regression in 6d4e5fe. Co-Authored-By: Mariusz Felisiak <felisiak.mariusz@gmail.com>

Refs #30449 -- Made RelatedOnlyFieldListFilter respect ModelAdmin.ord…

8289fc5

…ering.

felixxm force-pushed the ticket_30449 branch from 87cc033 to 8289fc5 Compare August 15, 2019 08:35

felixxm merged commit 8289fc5 into django:master Aug 15, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

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

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

zeyneloz commented May 22, 2019

gauravtoshniwal1989 left a comment

felixxm left a comment

zeyneloz commented Jun 13, 2019

felixxm left a comment

zeyneloz commented Aug 13, 2019

felixxm commented Aug 15, 2019 •

edited

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

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

Conversation

zeyneloz commented May 22, 2019

gauravtoshniwal1989 left a comment

Choose a reason for hiding this comment

felixxm left a comment

Choose a reason for hiding this comment

zeyneloz commented Jun 13, 2019

felixxm left a comment

Choose a reason for hiding this comment

zeyneloz commented Aug 13, 2019

felixxm commented Aug 15, 2019 • edited

felixxm commented Aug 15, 2019 •

edited