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

[Upstream] New CRUD for budget groups and headings #1768

Merged
merged 10 commits into from
Dec 28, 2018

Conversation

microweb10
Copy link
Collaborator

@microweb10 microweb10 commented Dec 19, 2018

References

PR consuldemocracy#3038
PR consuldemocracy#3043
PR consuldemocracy#3106

Does this PR need a Backport to CONSUL?

Backport only these commits:
bad9047
8f3fbea
6acbe41

spec/models/budget/heading_spec.rb Outdated Show resolved Hide resolved
spec/models/budget/heading_spec.rb Outdated Show resolved Hide resolved
spec/models/budget/heading_content_block_spec.rb Outdated Show resolved Hide resolved
spec/models/budget/heading_content_block_spec.rb Outdated Show resolved Hide resolved
spec/models/budget/heading_content_block_spec.rb Outdated Show resolved Hide resolved
spec/features/admin/budget_headings_spec.rb Outdated Show resolved Hide resolved
spec/features/admin/budget_headings_spec.rb Outdated Show resolved Hide resolved
spec/features/admin/budget_headings_spec.rb Outdated Show resolved Hide resolved
spec/features/admin/budget_headings_spec.rb Outdated Show resolved Hide resolved
spec/features/admin/budget_headings_spec.rb Outdated Show resolved Hide resolved
@microweb10 microweb10 changed the title [Upstream] New CRUD de budget groups and headings [Upstream] New CRUD for budget groups and headings Dec 19, 2018
app/helpers/content_blocks_helper.rb Outdated Show resolved Hide resolved
app/controllers/budgets/ballot/lines_controller.rb Outdated Show resolved Hide resolved
spec/features/admin/budget_groups_spec.rb Outdated Show resolved Hide resolved
spec/features/admin/budget_groups_spec.rb Outdated Show resolved Hide resolved
spec/features/admin/budget_groups_spec.rb Outdated Show resolved Hide resolved
app/controllers/admin/budget_headings_controller.rb Outdated Show resolved Hide resolved
app/controllers/admin/budget_headings_controller.rb Outdated Show resolved Hide resolved
@microweb10 microweb10 force-pushed the crud_budget_and_usa branch 2 times, most recently from 2b2bb46 to 7a8a033 Compare December 19, 2018 17:50
MatheusMiranda and others added 9 commits December 28, 2018 10:19
Signed-off-by: Matheus Miranda <matheusmirandalacerda@gmail.com>
In this PR consuldemocracy#3043
there were some change requests. In order to keep moving
we decided to merge the PR and do the changes ourselves.
To make it more consistent with the rest of the Admin panel,
the CRUD for budget groups and headings has been changed
from the old "all-in-one" form to a separate form for each resource.
Show information about longitude and latitude in a budget heading
Show information about custom content in a budget heading
Fix render of map (zoom scrollable and points clickable)
Fix typo in app/models/map_location.rb
@microweb10 microweb10 merged commit ee99157 into master Dec 28, 2018
@microweb10 microweb10 deleted the crud_budget_and_usa branch December 28, 2018 16:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants