Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Correct assets handling for EmailController #2611

Merged
merged 1 commit into from
Oct 11, 2016
Merged

Correct assets handling for EmailController #2611

merged 1 commit into from
Oct 11, 2016

Conversation

PatchRanger
Copy link
Contributor

Q A
Bug fix? y
New feature? n
Related user documentation PR URL -
Related developer documentation PR URL -
Issues addressed (#s or URLs) -
BC breaks? -
Deprecations? -

Description:

This PR fixes incorrect handling of assets in EmailController.
The implementation is totally copied from PageController.

Steps to test this PR:

  1. Add your own asset via custom bundle.
  2. Make sure it is also included at pages related to EmailController.

Steps to reproduce the bug:

  1. Add your own asset via custom bundle.
  2. Make sure it is missed at pages related to EmailController.

dongilbert
dongilbert approved these changes Sep 29, 2016
View reviewed changes
Copy link
Member

@dongilbert dongilbert left a comment

Choose a reason for hiding this comment

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

Curious what brought this up. I remember when I did the fixes in the PageController - it was a unique situation that I didn't realize could/should apply to email as well. Thanks for spotting it! +1

@dongilbert dongilbert added this to the 2.2.1 milestone Sep 29, 2016
@dongilbert dongilbert added T2 Medium difficulty to fix (issue) or test (PR) bug Issues or PR's relating to bugs ready-to-test PR's that are ready to test pending-test-confirmation PR's that require one test before they can be merged labels Sep 29, 2016
@PatchRanger
Copy link
Contributor Author

@dongilbert You are welcome. Thank you all for your time, you're doing a great job. Mautic is awesome!)

@alanhartless
Copy link
Contributor

+1

@alanhartless alanhartless merged commit 7507207 into mautic:staging Oct 11, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dongilbert dongilbert dongilbert approved these changes

Assignees
No one assigned
Labels
bug Issues or PR's relating to bugs pending-test-confirmation PR's that require one test before they can be merged ready-to-test PR's that are ready to test T2 Medium difficulty to fix (issue) or test (PR)
Projects
None yet
Milestone
2.2.1
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@PatchRanger @alanhartless @dongilbert