opendev/gerrit
Code Issues Proposed changes

Merge "Add HTML template for change comment emails"

Browse Source
This commit is contained in:
Wyatt Allen
2016-10-19 20:23:49 +00:00
committed by Gerrit Code Review
parent 6de5cb3a90 2223cb7c52
commit 34f2e198be
6 changed files with 179 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
gerrit-server/src/main/java/com/google/gerrit/server/mail/CommentSender.java
View File

@@ -136,11 +136,17 @@ public class CommentSender extends ReplyToChangeSender {
@Override
public void formatChange() throws EmailException {
appendText(textTemplate("Comment"));
if (useHtml()) {
appendHtml(soyHtmlTemplate("CommentHtml"));
}
}
@Override
public void formatFooter() throws EmailException {
appendText(textTemplate("CommentFooter"));
if (useHtml()) {
appendHtml(soyHtmlTemplate("CommentFooterHtml"));
}
}
/**
@@ -469,6 +475,7 @@ public class CommentSender extends ReplyToChangeSender {
commentData.put("isRobotComment", true);
commentData.put("robotId", robotComment.robotId);
commentData.put("robotRunId", robotComment.robotRunId);
commentData.put("robotUrl", robotComment.url);
} else {
commentData.put("isRobotComment", false);
}
@@ -521,4 +528,9 @@ public class CommentSender extends ReplyToChangeSender {
return "";
}
}
@Override
protected boolean supportsHtml() {
return true;
}
}

2
gerrit-server/src/main/java/com/google/gerrit/server/mail/MailSoyTofuProvider.java
View File

@@ -44,7 +44,9 @@ public class MailSoyTofuProvider implements Provider<SoyTofu> {
"ChangeFooterHtml.soy",
"ChangeSubject.soy",
"Comment.soy",
"CommentHtml.soy",
"CommentFooter.soy",
"CommentFooterHtml.soy",
"DeleteReviewer.soy",
"DeleteReviewerHtml.soy",
"DeleteVote.soy",