Skip to content

The Unified and Autonomous Development Platform

Minor improvement for issue and pull request notification template

Robin Shenfc2cb0d27c1b
diff --git a/server-core/src/main/java/io/onedev/server/notification/IssueNotificationManager.java b/server-core/src/main/java/io/onedev/server/notification/IssueNotificationManager.java
index e673ff0b50..f284ea80f4 100644
--- a/server-core/src/main/java/io/onedev/server/notification/IssueNotificationManager.java
+++ b/server-core/src/main/java/io/onedev/server/notification/IssueNotificationManager.java
@@ -22,6 +22,7 @@ import io.onedev.server.entityreference.ReferencedFromAware;
import io.onedev.server.event.issue.IssueChangeEvent;
import io.onedev.server.event.issue.IssueCommented;
import io.onedev.server.event.issue.IssueEvent;
+import io.onedev.server.event.issue.IssueOpened;
import io.onedev.server.infomanager.UserInfoManager;
import io.onedev.server.markdown.MarkdownManager;
import io.onedev.server.markdown.MentionParser;
@@ -75,11 +76,11 @@ public class IssueNotificationManager extends AbstractNotificationManager {
else
url = urlManager.urlFor(issue);
- String summary = issue.getState() + " - ";
+ String summary;
if (user != null)
- summary = summary + user.getDisplayName() + " " + event.getActivity();
+ summary = user.getDisplayName() + " " + event.getActivity();
else
- summary = summary + event.getActivity();
+ summary = event.getActivity();
for (Map.Entry<User, Boolean> entry: new QueryWatchBuilder<Issue>() {
@@ -223,7 +224,8 @@ public class IssueNotificationManager extends AbstractNotificationManager {
}
if (!bccUsers.isEmpty()) {
- String subject = String.format("[Issue %s] (Updated) %s", issue.getFQN(), issue.getTitle());
+ String subject = String.format("[Issue %s] (%s) %s",
+ issue.getFQN(), (event instanceof IssueOpened)?"Opened":"Updated", issue.getTitle());
Unsubscribable unsubscribable = new Unsubscribable(mailManager.getUnsubscribeAddress(issue));
String htmlBody = getHtmlBody(event, summary, event.getHtmlBody(), url, replyable, unsubscribable);
diff --git a/server-core/src/main/java/io/onedev/server/notification/PullRequestNotificationManager.java b/server-core/src/main/java/io/onedev/server/notification/PullRequestNotificationManager.java
index c7da1643ea..5cbc775971 100644
--- a/server-core/src/main/java/io/onedev/server/notification/PullRequestNotificationManager.java
+++ b/server-core/src/main/java/io/onedev/server/notification/PullRequestNotificationManager.java
@@ -168,13 +168,13 @@ public class PullRequestNotificationManager extends AbstractNotificationManager
}
}
- String summary = request.getStatusName() + " - ";
+ String summary;
if (user != null)
- summary = summary + user.getDisplayName() + " " + event.getActivity();
+ summary = user.getDisplayName() + " " + event.getActivity();
else if (committer != null)
- summary = summary + committer.getDisplayName() + " " + event.getActivity();
+ summary = committer.getDisplayName() + " " + event.getActivity();
else
- summary = summary + event.getActivity();
+ summary = event.getActivity();
if (event instanceof PullRequestOpened) {
for (PullRequestReview review: request.getReviews()) {
@@ -263,7 +263,8 @@ public class PullRequestNotificationManager extends AbstractNotificationManager
}
if (!bccUsers.isEmpty()) {
- String subject = String.format("[Pull Request %s] (Updated) %s", request.getFQN(), request.getTitle());
+ String subject = String.format("[Pull Request %s] (%s) %s",
+ request.getFQN(), (event instanceof PullRequestOpened)?"Opened":"Updated", request.getTitle());
String threadingReferences = "<" + request.getUUID() + "@onedev>";
Unsubscribable unsubscribable = new Unsubscribable(mailManager.getUnsubscribeAddress(request));
String htmlBody = getHtmlBody(event, summary, event.getHtmlBody(), url, replyable, unsubscribable);
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/MergeConfirmPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/MergeConfirmPanel.java
index 09621b7093..2c013c03d6 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/MergeConfirmPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/MergeConfirmPanel.java
@@ -4,16 +4,10 @@ import static io.onedev.server.model.support.pullrequest.MergeStrategy.CREATE_ME
import static io.onedev.server.model.support.pullrequest.MergeStrategy.REBASE_SOURCE_BRANCH_COMMITS;
import static io.onedev.server.model.support.pullrequest.MergeStrategy.SQUASH_SOURCE_BRANCH_COMMITS;
-import java.util.List;
-
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
-import org.eclipse.jgit.revwalk.RevCommit;
-
-import com.google.common.base.Splitter;
import io.onedev.server.model.PullRequest;
-import io.onedev.server.model.PullRequestUpdate;
import io.onedev.server.model.support.pullrequest.MergePreview;
import io.onedev.server.model.support.pullrequest.MergeStrategy;
import io.onedev.server.web.component.modal.ModalPanel;
@@ -33,46 +27,28 @@ public abstract class MergeConfirmPanel extends OperationConfirmPanel {
protected void onInitialize() {
super.onInitialize();
- String commitMessageBody = null;
PullRequest request = getPullRequest();
- if (request.getMergeStrategy() == MergeStrategy.SQUASH_SOURCE_BRANCH_COMMITS) {
- StringBuilder builder = new StringBuilder();
-
- for (PullRequestUpdate update: request.getSortedUpdates()) {
- for (RevCommit commit: update.getCommits()) {
- List<String> lines = Splitter.on('\n').splitToList(commit.getFullMessage().trim());
- for (int i=0; i<lines.size(); i++) {
- builder.append(i==0?"- ": " ");
- builder.append(lines.get(i)).append("\n");
- }
- builder.append("\n");
- }
- }
-
- commitMessageBody = builder.toString().trim();
- }
- String commitMessageSummary = null;
+ String commitMessage = null;
String description = null;
MergeStrategy mergeStrategy = getPullRequest().getMergeStrategy();
MergePreview mergePreview = getPullRequest().getMergePreview();
if (mergeStrategy == CREATE_MERGE_COMMIT)
- commitMessageSummary = "Merge pull request " + request.getNumberAndTitle();
- else if (mergeStrategy == SQUASH_SOURCE_BRANCH_COMMITS)
- commitMessageSummary = "Pull request " + request.getNumberAndTitle();
- else if (mergeStrategy == REBASE_SOURCE_BRANCH_COMMITS)
+ commitMessage = "Merge pull request " + request.getNumberAndTitle();
+ else if (mergeStrategy == SQUASH_SOURCE_BRANCH_COMMITS)
+ commitMessage = "Pull request " + request.getNumberAndTitle();
+ else if (mergeStrategy == REBASE_SOURCE_BRANCH_COMMITS)
description = "Source branch commits will be rebased onto target branch";
- else if (mergePreview.getMergeCommitHash().equals(mergePreview.getHeadCommitHash()))
+ else if (mergePreview.getMergeCommitHash().equals(mergePreview.getHeadCommitHash()))
description = "Source branch commits will be fast-forwarded to target branch";
else
- commitMessageSummary = "Merge pull request " + request.getNumberAndTitle();
+ commitMessage = "Merge pull request " + request.getNumberAndTitle();
getForm().add(new Label("description", description).setVisible(description != null));
- if (commitMessageSummary != null) {
- String commitMessage = commitMessageSummary;
- if (commitMessageBody != null)
- commitMessage += "\n\n" + commitMessageBody;
+ if (commitMessage != null) {
+ if (request.getDescription() != null)
+ commitMessage += "\n\n" + request.getDescription();
bean.setCommitMessage(commitMessage);
getForm().add(BeanContext.edit("commitMessage", bean));
} else {