Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[6609 ]Ks 2022 10 support btw phases #4638

Merged
merged 4 commits into from
Nov 4, 2022
Merged

[6609 ]Ks 2022 10 support btw phases #4638

merged 4 commits into from
Nov 4, 2022

Conversation

Rineee
Copy link
Contributor

@Rineee Rineee commented Nov 1, 2022 •
edited

This is supposed to implement the following behaviour:

  • show support (on, list, map and detail) during support phase and btw support and voting phase
  • support button only active during support phase
  • add 'most support' to ordering filter during support phase and btw support and voting phase
  • make 'most support' default ordering filter only btw support and voting phase

Notes:

  • do not test as admin
  • old participatory budgeting with rating phase doesnt fully work anymore (map pop up does not show rating), but ok with Caro

I did not add the tests yet as did not want to test unapproved code..

fixes #4109
fixes #4597

@Rineee Rineee force-pushed the ks-2022-10-support-btw-phases branch from 573b654 to 6a39b7c Compare November 1, 2022 14:52
@Rineee Rineee force-pushed the ks-2022-10-support-btw-phases branch from 6a39b7c to 704cba6 Compare November 2, 2022 14:46
fuzzylogic2000
fuzzylogic2000 approved these changes Nov 4, 2022
View reviewed changes
Copy link
Contributor

@fuzzylogic2000 fuzzylogic2000 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Supernice! And works perfectly!

meinberlin/apps/budgeting/templatetags/react_support.py Show resolved Hide resolved
meinberlin/apps/budgeting/api.py Show resolved Hide resolved
meinberlin/apps/budgeting/views.py Show resolved Hide resolved
tests/budgeting/test_proposals_api_filtering.py Show resolved Hide resolved
@fuzzylogic2000
Copy link
Contributor

Cool, should we merge?

@fuzzylogic2000 fuzzylogic2000 merged commit b45bf9c into main Nov 4, 2022
@fuzzylogic2000 fuzzylogic2000 deleted the ks-2022-10-support-btw-phases branch November 4, 2022 09:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fuzzylogic2000 fuzzylogic2000 fuzzylogic2000 approved these changes

@philli-m philli-m Awaiting requested review from philli-m

@goapunk goapunk Awaiting requested review from goapunk

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

comment count missing on react list budgeting: think about moving phase information to api
2 participants
@Rineee @fuzzylogic2000