Closed
Conversation
f7ef184 to
626eb1e
Compare
oriolgual
suggested changes
Aug 6, 2018
decidim-core/app/cells/decidim/amendable/emendation_actions_cell.rb
Outdated
Show resolved
Hide resolved
decidim-core/app/controllers/concerns/decidim/amendments_controller.rb
Outdated
Show resolved
Hide resolved
2 tasks
2eb37c2 to
33b17d2
Compare
This was referenced Aug 9, 2018
48d4026 to
28f76c8
Compare
c0575ea to
1ca5f26
Compare
Contributor
|
@agustibr could you please rebase this? |
1ca5f26 to
7c1e344
Compare
Contributor
|
Also @agustibr some conflicts have appeared, can you fix them please? 😄 |
* Fix proposals/emendations state * Test ProposalMCell proposal/emendation state * Fix rubocop offences (forgot) * Refactor amend proposal system spec * Start fixing admin dashboard * Fix admin dashboard * Start fixing amendment form validations * Refactor amendment form validations Basic functionality working with redirect_to amendable_gid * Refactor amendment form validation redirect_to * Feature/amendments proposals on proposals withdraw (#18) * Fix emendation withdraw * Refactor change_proposal_state_to_withdrawn * Fix proposals_show withdrawn translation missing * Fix states of proposals * Button Answer disabled if amendment * Refactor withdraw to work with "See all withdrawn proposals" * Check for amendments even if user is not logged in * Amend Proposal system test * Fix error when merging cristian/aitor branches * Check for amendments even if user is not logged in - fixed * Fix rubocop offences * Fix mistake when refactoring emendation withdraw Forgot to change withdraw_proposal.rb back to its original state. * Add withdraw amendment test * Fix admin dashboard * Add red color to withdrawn state in admin manager * Change proposal_state to resource_state * Resolve conversations * Feature/amendments proposals on proposals unable button (#19) * Unable "Answer" button when the proposal is an emendation * Fixed offenses with Rubocop * fixed translate
8cb61da to
acf5653
Compare
2 tasks
mrcasals
reviewed
Nov 26, 2018
| .by(1) | ||
| end | ||
|
|
||
| it "broadcasts ok" do |
Contributor
There was a problem hiding this comment.
Don't forget about readding these specs please
Contributor
|
Closing in favour of:
|
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
6 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?
A Participant can submit an emendation of a proposal, coauthors can accept or reject it.
Decidim::Amendmentsis a module introduced todecidim-coreused indecidim-proposals.The "Decidim::Amendable" concern introduces:
resource.emendations: the derivated (or child) resourcesresource.amenders: users that have emendations for the resourceresource.amended: the original (or parent) resource that was amendedresource.amendment: references the associationresource.amendable?resource.emendation?In this PR, an admin can enable amendments and a participant can create an amendment.
📥 Related PR's adding funcionality (that merge into this PR)
📌 Related Issues
📋 Subtasks
CHANGELOGentry📷 Screenshots (optional)