Add scope to Budgets, Debates, Meetings, Proposals and Surveys components#6309
Merged
tramuntanal merged 18 commits intodevelopfrom Sep 15, 2020
Merged
Add scope to Budgets, Debates, Meetings, Proposals and Surveys components#6309tramuntanal merged 18 commits intodevelopfrom
tramuntanal merged 18 commits intodevelopfrom
Conversation
9b43505 to
100e6a7
Compare
f21cbde to
3165737
Compare
29 tasks
6ede71e to
e32dacd
Compare
85e6088 to
4b0c7c8
Compare
ad18024 to
03856df
Compare
5e7ffd4 to
10ef889
Compare
7aba9c2 to
e4d7242
Compare
5cb3a8c to
78555f1
Compare
e4d7242 to
65e3dbb
Compare
Contributor
Author
|
@tramuntanal I've rebased and solved conflicts 😁 |
tramuntanal
reviewed
Sep 9, 2020
Contributor
tramuntanal
left a comment
There was a problem hiding this comment.
Good job and refactor @agustibr !
I've just commented some details before merging 😄
decidim-core/lib/decidim/scopable.rb
Outdated
Comment on lines
+73
to
+85
| # validation method for participatory spaces | ||
| def scope_belongs_to_organization | ||
| return if !scope || !organization | ||
|
|
||
| errors.add(:scope, :invalid) unless organization.scopes.where(id: scope.id).exists? | ||
| end | ||
|
|
||
| # validation method for components | ||
| def scope_belongs_to_participatory_space | ||
| return if !scopes_enabled? || !participatory_space | ||
|
|
||
| errors.add(:scope, :invalid) if participatory_space.out_of_scope?(scope) | ||
| end |
Contributor
There was a problem hiding this comment.
shouldn't we have this methods in the corresponding ScopableComponent and ScopableParticipatorySpace concerns?
Contributor
Author
There was a problem hiding this comment.
validate :scope_belongs_to_organization ensures that the scopable (space, component or any other resource) is scoped within the organization's scope, I think this is a good place for this method.
and the :scope_belongs_to_participatory_space method ensures that any resource scope (such as a component) is scoped within the spaces' scope, so yes I'll move this method to the ScopableComponent module where validate :scope_belongs_to_participatory_space is called.
Contributor
|
by the way there's an assemblies test failing |
- rename/refactor Scopable Concerns - debates - meetings - proposals - surveys
…o ScopableComponent
f1d0cde to
190f604
Compare
Contributor
Author
|
Thanks @tramuntanal ! I did some changes as suggested. Tests should pass ok, the previous failed test from assemblies seems that is not related to this PR, and re-runing the CI solved it 😁 |
Contributor
Author
|
Hi @tramuntanal, all checks passed ✅ 😁 |
mrcasals
pushed a commit
to codegram/decidim
that referenced
this pull request
Sep 16, 2020
…ents (decidim#6309) * add scope to components * add scopes to budgets * fix survey types spec * feature(budgets): add scope to budget resource * add component spec to check_boxes_tree_helper_spec.rb * add spec: scope_belongs_to_component_validator * added scopable resource examples * feat(budgets): add scope info to admin index * fix(projects): index scope filter by budget scope * feat(admin): scope helper methods for index views * fix(i18n): add missing keys * fix check_box_tree helper when nil scope * remove unused i18n keys * add resource_filter_scope_values method * fix wrong merge errors with feature/budget_component_w_many_budgets * chore(scopable): move `scope_belongs_to_participatory_space` method to ScopableComponent * chore(scopes_picker): add docs for :namespace option * chore(proposals): remove trait :with_geocoding_and_collaborative_drafts_enabled
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
🎩 What? Why?
An administrator can configure some components (
Budgets/Debates/Meetings/Proposals/Surveys) to work with scopes.This PR extracts PR #5941 from the closed PR #5993, to include scopable components into PR #6223.
📌 Related Issues
📋 Subtasks
Add
CHANGELOGupgrade notes, if requiredIf there's a new public field, add it to GraphQL API
Add documentation regarding the feature
Add/modify seeds
Add tests
admin: add component general setting scope
all components use
scoperelated method fallback to its participatory_spacerename/refactor Scopable Concern:
Scopable: has all common logicScopableParticipatorySpace(wasScopable), has the logic related to spaces.ScopableComponent, has the logic related to componentsScopableResource(wasScopableComponent), has the logic for resources📷 Screenshots (optional)