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

Fix: Allow Email to re-render when data changes #9876

Merged
merged 3 commits into from
Mar 3, 2021
Merged

Fix: Allow Email to re-render when data changes #9876

merged 3 commits into from
Mar 3, 2021

Conversation

NikxDa
Copy link
Contributor

@NikxDa NikxDa commented Mar 1, 2021

This PR fixes #9289

@NikxDa NikxDa mentioned this pull request Mar 1, 2021
Closed
1 task
@NikxDa
Copy link
Contributor Author

NikxDa commented Mar 1, 2021 •
edited
Loading

PHPUnit reporting 100% on the updated EmailTest. Pre-PR code fails as expected.

@maxime-rainville maxime-rainville changed the base branch from 4 to 4.7 March 2, 2021 03:26
@maxime-rainville maxime-rainville changed the base branch from 4.7 to 4 March 2, 2021 03:26
maxime-rainville
maxime-rainville requested changes Mar 2, 2021
View reviewed changes
Copy link
Contributor

@maxime-rainville maxime-rainville left a comment

Choose a reason for hiding this comment

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

Looks good ... tested it locally and it works as expected. Unit tests looks thorough.

Could you target the change to the 4.7 branch so we can chip it in a 4.7 patch release?

src/Control/Email/Email.php Outdated Show resolved Hide resolved
@NikxDa NikxDa force-pushed the bugfix/email-data branch from c43789c to 325ebf1 Compare March 2, 2021 21:51
@NikxDa NikxDa changed the base branch from 4 to 4.7 March 2, 2021 21:52
@NikxDa
Copy link
Contributor Author

NikxDa commented Mar 2, 2021

@maxime-rainville Now targeted against the 4.7 branch

@NikxDa NikxDa requested a review from maxime-rainville March 2, 2021 22:11
maxime-rainville
maxime-rainville reviewed Mar 2, 2021
View reviewed changes
src/Control/Email/Email.php Outdated
/**
* @return $this
*/
public function invalidateBody() {
Copy link
Contributor

Choose a reason for hiding this comment

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

Our linter wants this to be a separate line

Suggested change
public function invalidateBody() {
public function invalidateBody()
{

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Have added a new commit.

maxime-rainville
maxime-rainville approved these changes Mar 2, 2021
View reviewed changes
Copy link
Contributor

@maxime-rainville maxime-rainville left a comment

Choose a reason for hiding this comment

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

Merge once the linting error is fix.

@maxime-rainville maxime-rainville merged commit d2fa64b into silverstripe:4.7 Mar 3, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@maxime-rainville maxime-rainville maxime-rainville approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Email not re-rendering HTML template
2 participants
@NikxDa @maxime-rainville