The Unified and Autonomous Development Platform
Minor improvement of pull request assignee auto selection
Robin Shene070950a8928
diff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestAssigneeRemoveData.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestAssigneeRemoveData.javaindex 161c90353e..85fac1063b 100644--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestAssigneeRemoveData.java+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestAssigneeRemoveData.java@@ -20,9 +20,9 @@ public class PullRequestAssigneeRemoveData extends PullRequestChangeData {public String getActivity() {User user = getUser();if (user != null)- return "added assignee \"" + user.getDisplayName() + "\"";+ return "removed assignee \"" + user.getDisplayName() + "\"";else- return "added assignee unknown";+ return "removed assignee unknown";}@Nullablediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.javaindex 9134782890..85577d3673 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java@@ -60,11 +60,11 @@ import io.onedev.server.model.CodeComment;import io.onedev.server.model.CodeCommentReply;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;+import io.onedev.server.model.PullRequest.Status;import io.onedev.server.model.PullRequestAssignment;import io.onedev.server.model.PullRequestReview;import io.onedev.server.model.PullRequestUpdate;import io.onedev.server.model.User;-import io.onedev.server.model.PullRequest.Status;import io.onedev.server.model.support.CompareContext;import io.onedev.server.model.support.Mark;import io.onedev.server.model.support.pullrequest.CloseInfo;@@ -246,7 +246,16 @@ public class NewPullRequestPage extends ProjectPage implements RevisionDiff.AnnoOneDev.getInstance(PullRequestManager.class).checkReviews(request, Lists.newArrayList());- if (SecurityUtils.canWriteCode(target.getProject())) {+ List<User> owners = target.getProject().getUserAuthorizations().stream()+ .filter(it->it.getRole().isOwner())+ .map(it->it.getUser())+ .collect(Collectors.toList());+ if (owners.size() == 1) {+ PullRequestAssignment assignment = new PullRequestAssignment();+ assignment.setRequest(request);+ assignment.setUser(owners.get(0));+ request.getAssignments().add(assignment);+ } else if (SecurityUtils.canWriteCode(target.getProject())) {PullRequestAssignment assignment = new PullRequestAssignment();assignment.setRequest(request);assignment.setUser(SecurityUtils.getUser());