budgeting//contrib/filters: add random ordering to ProposalFilterSet … #4582
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
fuzzylogic2000
approved these changes
Oct 20, 2022
There was a problem hiding this comment.
Nice!
And an interesting find, that we order the Django a4-one before filtering for the module. But I also think you are right, it doesn't matter as we always use either or and don't need the same random ordering in both cases.
Happy that you merge when you updated a4!
| @@ -112,12 +112,12 @@ def list(self, request, *args, **kwargs): | |||
| if has_feature_active(self.module, Proposal, 'support'): | |||
| ordering_choices += ('-positive_rating_count', _('Most support')), | |||
| ordering_choices += ('-comment_count', _('Most commented')), \ | |||
| ('-daily_random', _('Random')), | |||
| ('dailyrandom', _('Random')), | |||
There was a problem hiding this comment.
👍 It doesn't matter if it's ascending or descending random. 🤣
added 2 commits
October 20, 2022 17:13
…and rename filter in api to be able to pass it
Rineee
force-pushed
the
ks-2022-10-fix-annotations-dailyrandom
branch
from
1de0b9a to
864e8e7
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
…and rename filter in api to be able to pass it
depends on liqd/adhocracy4#1246
fixes #4574
I had to add the daily random sorting to the list view as otherwise the annotations dont work and thus dont show up in the map pop ups. To make it work with the api filter, I had to change the wording there to be consistent with the wording in the list filte in a4.
The daily random sorting is different for the django list and react list, that is because in the react list we are only ordering the proposals of a certain module whereas in the django list, the ordering is determined on all proposal in the db and then later the proposals are filtered for the module. I did not dare to touch that as that is deep in a4 and django. But since we will always have either or, it should be fine?