Skip to content

Feat: Improvements in amendments diffs#5185

Merged
oriolgual merged 5 commits intodecidim:masterfrom
CodiTramuntana:feat/amendments_diff_improvements
Jun 10, 2019
Merged

Feat: Improvements in amendments diffs#5185
oriolgual merged 5 commits intodecidim:masterfrom
CodiTramuntana:feat/amendments_diff_improvements

Conversation

@aitorlb
Copy link
Copy Markdown
Contributor

@aitorlb aitorlb commented Jun 7, 2019

🎩 What? Why?

  • Changed the amendment show page to display changes made using version control (as was originally intended in Amendments: Proposals on proposals #2292).
  • Added a diff renderer when accepting an amendment (review page) to help with the reviewing process.

📌 Related Issues

📋 Subtasks

  • Add CHANGELOG entry
  • Add tests

📷 Screenshots (optional)

Amendment show page

amendment_show_changed_title

Amendment review page (unified mode)

review_block

Amendment review page (unified mode)

review_split

Amendment review page (mobile version)

preview-review_mobile


def update_proposal
@proposal.update!(attributes)
@proposal = Decidim.traceability.update!(
Copy link
Copy Markdown
Contributor Author

@aitorlb aitorlb Jun 7, 2019

Choose a reason for hiding this comment

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

I mistakenly deleted the traceability in another PR.

@aitorlb aitorlb marked this pull request as ready for review June 9, 2019 20:04
@aitorlb aitorlb requested a review from a team as a code owner June 9, 2019 20:04
@oriolgual oriolgual merged commit f40e7f4 into decidim:master Jun 10, 2019
@aitorlb aitorlb mentioned this pull request Jun 10, 2019
5 tasks
@agustibr
Copy link
Copy Markdown
Contributor

👏 👏 👏

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants