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 EmailTask Email body lost bug ， Remove fields: BodyText,IsBodyHtml,IsBodyText #13743

Merged
merged 1 commit into from
May 25, 2023
Merged

Fix EmailTask Email body lost bug ， Remove fields: BodyText,IsBodyHtml,IsBodyText #13743

merged 1 commit into from
May 25, 2023

Conversation

hyzx86
Copy link
Contributor

@hyzx86 hyzx86 commented May 25, 2023

Fix #13742

@hyzx86 hyzx86 requested a review from hishamco as a code owner May 25, 2023 05:00
hishamco
hishamco reviewed May 25, 2023
View reviewed changes
Copy link
Member

@hishamco hishamco left a comment

Choose a reason for hiding this comment

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

I'm fine with the changes, but I prefer to write a docs for the breaking changes, something like what we did in each release

src/OrchardCore.Modules/OrchardCore.Email/Workflows/Activities/EmailTask.cs
@@ -83,29 +83,12 @@ public WorkflowExpression<string> Body
set => SetProperty(value);
}

public WorkflowExpression<string> BodyText
Copy link
Member

Choose a reason for hiding this comment

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

Still, I'm wondering why I never delete it!! maybe to avoid breaking

Copy link
Member

Choose a reason for hiding this comment

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

Something like this for 1.7.0 release

src/OrchardCore.Modules/OrchardCore.Email/Workflows/Activities/EmailTask.cs
@@ -121,7 +104,7 @@ public override async Task<ActivityExecutionResult> ExecuteAsync(WorkflowExecuti
var cc = await _expressionEvaluator.EvaluateAsync(Cc, workflowContext, null);
var bcc = await _expressionEvaluator.EvaluateAsync(Bcc, workflowContext, null);
var subject = await _expressionEvaluator.EvaluateAsync(Subject, workflowContext, null);
var body = await _expressionEvaluator.EvaluateAsync(BodyText, workflowContext, IsHtmlBody ? _htmlEncoder : null);
var body = await _expressionEvaluator.EvaluateAsync(Body, workflowContext, IsHtmlBody ? _htmlEncoder : null);
Copy link
Member

Choose a reason for hiding this comment

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

Nice catch

@sebastienros sebastienros merged commit 6fb3254 into OrchardCMS:main May 25, 2023
@hyzx86 hyzx86 deleted the EmailTask branch June 13, 2024 06:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hishamco hishamco hishamco left review comments

@sebastienros sebastienros sebastienros 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.

EmailTask breaking change
3 participants
@hyzx86 @sebastienros @hishamco