Merged
Conversation
6 tasks
ivan-mr
previously approved these changes
Jul 30, 2020
Leusev
previously approved these changes
Jul 30, 2020
Contributor
Leusev
left a comment
There was a problem hiding this comment.
Looks ok for me @tramuntanal 👍
559e8ab to
dc79750
Compare
Quentinchampenois
pushed a commit
to Quentinchampenois/decidim
that referenced
this pull request
Aug 14, 2020
* Do not use `@organization` from partial * Test when the organization has a logo or not
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
3 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?
Since #5888 the
decidim-core/app/views/layouts/decidim/_mailer_logo.html.erbpartial was using@organizationto access the organization object. It worked fine in the context of theNewsletterMailerbut now this partial is also invoked fromdecidim-core/app/cells/decidim/newsletter_templates/image_text_cta/show.erbwithout a global@organizationattribute. This use case happens when rendering the preview of newsletter templates from the administration panel.This PR uses
organizationlocal variable instead of@organization.📌 Related Issues
📋 Subtasks
CHANGELOGupgrade notes, if required📷 Screenshots (optional)