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.

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

budgeting: add rule to view support also between phases and use rule … #4606

Merged

Conversation

Rineee
Copy link
Contributor

@Rineee Rineee commented Oct 24, 2022

…for map pop up in map view

depends on liqd/adhocracy4#1251

Did not yet apply the rule in list and detail views, but added separate tasks in story.

@Rineee Rineee added the Dev: A4 depending PR or issue dependent on A4 label Oct 24, 2022
@Rineee Rineee force-pushed the ks-2022-10-budgeting-show-support-in-map-pop-up branch from 6360809 to d8490c6 Compare October 25, 2022 11:33
{% map_display_points object_list module.settings_instance.polygon %}
{% if module.blueprint_type == 'PB3' %}
{% has_or_would_have_perm 'meinberlin_budgeting.view_support' request.user module as may_view_support %}
{% map_display_points object_list module.settings_instance.polygon 'true' may_view_support|yesno:"false,true" %}
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This is a bit hacky with the yesno template tag, but did not really find a better solution for negating a bool in template 🤷‍♀️

Copy link
Contributor

Choose a reason for hiding this comment

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

I think it's fine!

@Rineee Rineee changed the title budgeting: add rule to view support also between phases and use rule … WIP: budgeting: add rule to view support also between phases and use rule … Oct 25, 2022
@Rineee Rineee changed the title WIP: budgeting: add rule to view support also between phases and use rule … budgeting: add rule to view support also between phases and use rule … Oct 26, 2022
@Rineee Rineee force-pushed the ks-2022-10-budgeting-show-support-in-map-pop-up branch from 5239650 to fe098ee Compare October 26, 2022 08:32
@Rineee
Copy link
Contributor Author

Rineee commented Oct 26, 2022

@fuzzylogic2000 I decided to do the detail and list view permissions in another PR, so this one could already be reviewed, it only handles the map pop up. I added a task for the missing test..

package.json Outdated Show resolved Hide resolved
@Rineee Rineee force-pushed the ks-2022-10-budgeting-show-support-in-map-pop-up branch from fe098ee to 739c1c4 Compare October 26, 2022 09:58
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.

Cool!

{% map_display_points object_list module.settings_instance.polygon %}
{% if module.blueprint_type == 'PB3' %}
{% has_or_would_have_perm 'meinberlin_budgeting.view_support' request.user module as may_view_support %}
{% map_display_points object_list module.settings_instance.polygon 'true' may_view_support|yesno:"false,true" %}
Copy link
Contributor

Choose a reason for hiding this comment

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

I think it's fine!

@fuzzylogic2000 fuzzylogic2000 merged commit 50c935f into main Oct 26, 2022
@fuzzylogic2000 fuzzylogic2000 deleted the ks-2022-10-budgeting-show-support-in-map-pop-up branch October 26, 2022 10:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Dev: A4 depending PR or issue dependent on A4
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants