Fix: multiple items related to amendments step settings and wizard#5263
Merged
oriolgual merged 20 commits intodecidim:masterfrom Jul 26, 2019
Merged
Conversation
…d radio buttons appearance Added tests
Updated dummy resource to work with amendable Refactored amendable to work with both authorable and coauthorable models Updated forms with new amendable methods
aitorlb
commented
Jul 10, 2019
| end | ||
|
|
||
| # Handles the logic to assign an author to the resource, be it Coauthorable or Authorable. | ||
| def add_author(author, user_group = nil) |
Contributor
Author
There was a problem hiding this comment.
Proposals are Coauthorable, DummyResources are Authorable.
oriolgual
previously approved these changes
Jul 25, 2019
Contributor
|
@aitorlb could you please rebase to fix the conflicts? |
oriolgual
approved these changes
Jul 26, 2019
2 tasks
6 tasks
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
2 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?
Fixed
Decidim::Admin::SettingsHelper::amendments_visibility_form_field(form, options)The(fixed in Fix: Decidim::Admin::ComponentForm validations #5269)checkedvalue only worked for:participatory_spaceswithstepsFixed
Decidim::Admin::SettingsHelper::participatory_texts_extra_options:help_textexplaining why the:participatory_texts_enabledwas disabled was being added even if the setting wasn't being disabled.Fixed
Decidim::AmendmentsController#ensure_is_draftcurrent_userwas the author of theamendment_draftFixed
Decidim::Proposals::ProposalsController#showFixed
decidim-proposals/app/views/decidim/proposals/proposals/_filters.html.erb:15Fixed
Decidim::Proposals::ParticipatoryTextProposalCell:amendments_visibiltysetting and the button may or may not be disabled based on the:amendment_creation_enabledsetting.Changed concern
Decidim::Amendable#visible_emendations_for(current_user)now filters out emendations "drafts".#amendable_typehas been dropped in favor ofself.class(as discussed here); can be reverted if reviewers ask for it.📌 Related Issues
amendments_visibilitycomponent step setting #5223📋 Subtasks
CHANGELOGentry📷 Screenshots (optional)
Amendments visibility options BEFORE
Amendments visibility options AFTER
Amend button disabled in Participatory Texts