Skip to content

The Unified and Autonomous Development Platform

feat: Able to specify default pull request assignees (OD-2179)

Robin Shena2fe40455381
diff --git a/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java b/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java
index 08a27cde3f..fde6ad753b 100644
--- a/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java
+++ b/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java
@@ -7186,7 +7186,30 @@ public class DataMigrator {
}
}
- private void migrate182(File dataDir, Stack<Integer> versions) {
+ private void migrate182_reviewRequirement(@Nullable Element reviewRequirementElement) {
+ if (reviewRequirementElement != null) {
+ String reviewRequirement = reviewRequirementElement.getText();
+ reviewRequirement = reviewRequirement.replaceAll("\\)\\s+and\\s+(user|group)", ") $1");
+ reviewRequirementElement.setText(reviewRequirement);
+ }
}
+
+ private void migrate182(File dataDir, Stack<Integer> versions) {
+ for (File file : dataDir.listFiles()) {
+ if (file.getName().startsWith("Projects.xml")) {
+ VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);
+ for (Element element : dom.getRootElement().elements()) {
+ element.element("pullRequestSetting").addElement("defaultAssignees");
+ for (var branchProtectionElement : element.element("branchProtections").elements()) {
+ migrate182_reviewRequirement(branchProtectionElement.element("reviewRequirement"));
+ for (Element fileProtectionElement : branchProtectionElement.element("fileProtections").elements()) {
+ migrate182_reviewRequirement(fileProtectionElement.element("reviewRequirement"));
+ }
+ }
+ }
+ dom.writeToFile(file, false);
+ }
+ }
+ }
}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserManager.java
index d273f1ce8e..5c101c497c 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserManager.java
@@ -105,6 +105,7 @@ public class DefaultUserManager extends BaseEntityManager<User> implements UserM
protection.onRenameUser(oldName, user.getName());
project.getIssueSetting().onRenameUser(oldName, user.getName());
project.getBuildSetting().onRenameUser(oldName, user.getName());
+ project.getPullRequestSetting().onRenameUser(oldName, user.getName());
} catch (Exception e) {
throw new RuntimeException("Error checking user reference in project '" + project.getPath() + "'", e);
}
@@ -153,6 +154,7 @@ public class DefaultUserManager extends BaseEntityManager<User> implements UserM
usageInProject.add(protection.onDeleteUser(user.getName()));
usageInProject.add(project.getIssueSetting().onDeleteUser(user.getName()));
usageInProject.add(project.getBuildSetting().onDeleteUser(user.getName()));
+ usageInProject.add(project.getPullRequestSetting().onDeleteUser(user.getName()));
usageInProject.prefix("project '" + project.getPath() + "': settings");
usage.add(usageInProject);
} catch (Exception e) {
diff --git a/server-core/src/main/java/io/onedev/server/model/Project.java b/server-core/src/main/java/io/onedev/server/model/Project.java
index 48454123d2..78adddf1d2 100644
--- a/server-core/src/main/java/io/onedev/server/model/Project.java
+++ b/server-core/src/main/java/io/onedev/server/model/Project.java
@@ -691,6 +691,10 @@ public class Project extends AbstractEntity implements LabelSupport<ProjectLabel
}
return forkAncestors;
}
+
+ private UserManager getUserManager() {
+ return OneDev.getInstance(UserManager.class);
+ }
private ProjectManager getProjectManager() {
return OneDev.getInstance(ProjectManager.class);
@@ -1905,7 +1909,7 @@ public class Project extends AbstractEntity implements LabelSupport<ProjectLabel
return "**";
}
- public MergeStrategy findDefaultMergeStrategy() {
+ public MergeStrategy findDefaultPullRequestMergeStrategy() {
Project current = this;
do {
if (current.getPullRequestSetting().getDefaultMergeStrategy() != null)
@@ -1916,6 +1920,27 @@ public class Project extends AbstractEntity implements LabelSupport<ProjectLabel
return MergeStrategy.CREATE_MERGE_COMMIT;
}
+ public List<User> findDefaultPullRequestAssignees() {
+ Project current = this;
+ do {
+ if (!current.getPullRequestSetting().getDefaultAssignees().isEmpty()) {
+ var users = new ArrayList<User>();
+ for (var userName: current.getPullRequestSetting().getDefaultAssignees()) {
+ var user = getUserManager().findByName(userName);
+ if (user == null)
+ throw new ExplicitException("Pull request default assignee not found: " + userName);
+ else if (!SecurityUtils.canWriteCode(user.asSubject(), this))
+ throw new ExplicitException("Pull request default assignee does not have code write permission over the target project: " + userName);
+ users.add(user);
+ }
+ return users;
+ }
+ current = current.getParent();
+ } while (current != null);
+
+ return new ArrayList<>();
+ }
+
public String getSiteLockName() {
return getSiteLockName(getId());
}
diff --git a/server-core/src/main/java/io/onedev/server/model/PullRequest.java b/server-core/src/main/java/io/onedev/server/model/PullRequest.java
index e90e798843..741e48a919 100644
--- a/server-core/src/main/java/io/onedev/server/model/PullRequest.java
+++ b/server-core/src/main/java/io/onedev/server/model/PullRequest.java
@@ -919,13 +919,13 @@ public class PullRequest extends ProjectBelonging
|| mergePreview.getMergeCommitHash() == null
|| !mergePreview.getMergeCommitHash().equals(getBuildCommitHash());
} else {
- return mergePreview != null || mergePreview.getMergeCommitHash() != null;
+ return mergePreview != null && mergePreview.getMergeCommitHash() != null;
}
}
public boolean isBuildRequirementSatisfied() {
BuildRequirement requirement = getBuildRequirement();
- if (requirement.isStictMode() && !requirement.getRequiredJobs().isEmpty() && isBuildCommitOutdated())
+ if (requirement.isStrictMode() && !requirement.getRequiredJobs().isEmpty() && isBuildCommitOutdated())
return false;
for (Build build: getCurrentBuilds()) {
diff --git a/server-core/src/main/java/io/onedev/server/model/support/code/BranchProtection.java b/server-core/src/main/java/io/onedev/server/model/support/code/BranchProtection.java
index e0750bc77e..0f09b84ebb 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/code/BranchProtection.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/code/BranchProtection.java
@@ -329,7 +329,7 @@ public class BranchProtection implements Serializable {
break;
}
}
- return usage.prefix("code: branch protection '" + getBranches() + "'");
+ return usage.prefix("branch protection '" + getBranches() + "'").prefix("code");
}
public void onRenameUser(String oldName, String newName) {
@@ -355,7 +355,7 @@ public class BranchProtection implements Serializable {
break;
}
}
- return usage.prefix("code: branch protection '" + getBranches() + "'");
+ return usage.prefix("branch protection '" + getBranches() + "'").prefix("code");
}
/**
diff --git a/server-core/src/main/java/io/onedev/server/model/support/code/BuildRequirement.java b/server-core/src/main/java/io/onedev/server/model/support/code/BuildRequirement.java
index a16d25bf47..a08a51955e 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/code/BuildRequirement.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/code/BuildRequirement.java
@@ -6,19 +6,19 @@ public class BuildRequirement {
private final Collection<String> requiredJobs;
- private final boolean stictMode;
+ private final boolean strictMode;
public BuildRequirement(Collection<String> requiredJobs, boolean strictMode) {
this.requiredJobs = requiredJobs;
- this.stictMode = strictMode;
+ this.strictMode = strictMode;
}
public Collection<String> getRequiredJobs() {
return requiredJobs;
}
- public boolean isStictMode() {
- return stictMode;
+ public boolean isStrictMode() {
+ return strictMode;
}
}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/code/TagProtection.java b/server-core/src/main/java/io/onedev/server/model/support/code/TagProtection.java
index d5a2cd50a3..1ada449eeb 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/code/TagProtection.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/code/TagProtection.java
@@ -125,7 +125,7 @@ public class TagProtection implements Serializable {
Usage usage = new Usage();
if (UserMatch.isUsingGroup(userMatch, groupName))
usage.add("applicable users");
- return usage.prefix("code: tag protection '" + getTags() + "'");
+ return usage.prefix("tag protection '" + getTags() + "'").prefix("code");
}
public void onRenameUser(String oldName, String newName) {
@@ -136,7 +136,7 @@ public class TagProtection implements Serializable {
Usage usage = new Usage();
if (UserMatch.isUsingUser(userMatch, userName))
usage.add("applicable users");
- return usage.prefix("code: tag protection '" + getTags() + "'");
+ return usage.prefix("tag protection '" + getTags() + "'").prefix("code");
}
public Usage getTagUsage(String tagName) {
diff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/ProjectPullRequestSetting.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/ProjectPullRequestSetting.java
index 7b5d89ddf4..2785272b7b 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/ProjectPullRequestSetting.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/ProjectPullRequestSetting.java
@@ -2,9 +2,18 @@ package io.onedev.server.model.support.pullrequest;
import io.onedev.commons.bootstrap.Bootstrap;
import io.onedev.server.annotation.Editable;
+import io.onedev.server.annotation.UserChoice;
+import io.onedev.server.model.Project;
+import io.onedev.server.model.User;
+import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.security.permission.WriteCode;
+import io.onedev.server.util.usage.Usage;
import javax.annotation.Nullable;
import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
import java.util.List;
@Editable
@@ -16,6 +25,8 @@ public class ProjectPullRequestSetting implements Serializable {
private MergeStrategy defaultMergeStrategy;
+ private List<String> defaultAssignees = new ArrayList<>();
+
@Nullable
public List<NamedPullRequestQuery> getNamedQueries() {
return namedQueries;
@@ -43,4 +54,36 @@ public class ProjectPullRequestSetting implements Serializable {
public void setDefaultMergeStrategy(MergeStrategy defaultMergeStrategy) {
this.defaultMergeStrategy = defaultMergeStrategy;
}
+
+ @Editable(order=300, placeholder = "Inherit from parent", rootPlaceholder = "Not assigned", description = "" +
+ "Specify default assignees of pull requests submitted to this project. " +
+ "Only users with the write code permission to the project can be selected")
+ @UserChoice("getAssigneeChoices")
+ public List<String> getDefaultAssignees() {
+ return defaultAssignees;
+ }
+
+ public void setDefaultAssignees(List<String> defaultAssignees) {
+ this.defaultAssignees = defaultAssignees;
+ }
+
+ private static List<User> getAssigneeChoices() {
+ var choices = new ArrayList<>(SecurityUtils.getAuthorizedUsers(Project.get(), new WriteCode()));
+ Collections.sort(choices, Comparator.comparing(User::getDisplayName));
+ return choices;
+ }
+
+ public void onRenameUser(String oldName, String newName) {
+ var index = getDefaultAssignees().indexOf(oldName);
+ if (index != -1)
+ getDefaultAssignees().set(index, newName);
+ }
+
+ public Usage onDeleteUser(String name) {
+ Usage usage = new Usage();
+ if (getDefaultAssignees().contains(name))
+ usage.add("default assignees");
+ return usage.prefix("pull request").prefix("code");
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/PullRequestResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/PullRequestResource.java
index a050de4864..57522587f3 100644
--- a/server-core/src/main/java/io/onedev/server/rest/resource/PullRequestResource.java
+++ b/server-core/src/main/java/io/onedev/server/rest/resource/PullRequestResource.java
@@ -259,11 +259,20 @@ public class PullRequestResource {
}
}
- for (Long assigneeId: data.getAssigneeIds()) {
- PullRequestAssignment assignment = new PullRequestAssignment();
- assignment.setRequest(request);
- assignment.setUser(userManager.load(assigneeId));
- request.getAssignments().add(assignment);
+ if (!data.getAssigneeIds().isEmpty()) {
+ for (Long assigneeId : data.getAssigneeIds()) {
+ PullRequestAssignment assignment = new PullRequestAssignment();
+ assignment.setRequest(request);
+ assignment.setUser(userManager.load(assigneeId));
+ request.getAssignments().add(assignment);
+ }
+ } else {
+ for (var assignee: target.getProject().findDefaultPullRequestAssignees()) {
+ PullRequestAssignment assignment = new PullRequestAssignment();
+ assignment.setRequest(request);
+ assignment.setUser(assignee);
+ request.getAssignments().add(assignment);
+ }
}
pullRequestManager.open(request);
diff --git a/server-core/src/main/java/io/onedev/server/util/reviewrequirement/ReviewRequirement.g4 b/server-core/src/main/java/io/onedev/server/util/reviewrequirement/ReviewRequirement.g4
index 214a832dd7..18b044cc52 100644
--- a/server-core/src/main/java/io/onedev/server/util/reviewrequirement/ReviewRequirement.g4
+++ b/server-core/src/main/java/io/onedev/server/util/reviewrequirement/ReviewRequirement.g4
@@ -1,6 +1,6 @@
grammar ReviewRequirement;
-requirement: WS* criteria (WS+ 'and' WS+ criteria)* WS* EOF;
+requirement: WS* criteria (WS+ criteria)* WS* EOF;
criteria: userCriteria | groupCriteria;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/assignment/AssignmentListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/assignment/AssignmentListPanel.java
index fa3f6051ed..310e659a1c 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/assignment/AssignmentListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/assignment/AssignmentListPanel.java
@@ -106,6 +106,7 @@ public abstract class AssignmentListPanel extends Panel {
PullRequest.getChangeObservable(getPullRequest().getId()));
}
assignmentsModel.detach();
+ onAssignmentsChanged(target);
}
@Override
@@ -129,11 +130,12 @@ public abstract class AssignmentListPanel extends Panel {
setVisible(!getPullRequest().isMerged() && SecurityUtils.canModifyPullRequest(getPullRequest()));
}
- @Override
+ @Override
protected void onSelect(AjaxRequestTarget target, User user) {
super.onSelect(target, user);
if (getPullRequest().isNew())
target.add(AssignmentListPanel.this);
+ onAssignmentsChanged(target);
}
@Override
@@ -154,6 +156,10 @@ public abstract class AssignmentListPanel extends Panel {
setOutputMarkupId(true);
}
+
+ protected void onAssignmentsChanged(AjaxRequestTarget target) {
+
+ }
@Override
public void renderHead(IHeaderResponse response) {
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/build/PullRequestJobsPanel.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/build/PullRequestJobsPanel.java
index 22969d4e18..de4beb38c3 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/build/PullRequestJobsPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/build/PullRequestJobsPanel.java
@@ -34,6 +34,7 @@ import static io.onedev.server.search.entity.build.BuildQuery.getRuleName;
import static io.onedev.server.search.entity.build.BuildQueryLexer.And;
import static io.onedev.server.search.entity.build.BuildQueryLexer.Is;
import static io.onedev.server.util.criteria.Criteria.quote;
+import static java.util.Comparator.*;
@SuppressWarnings("serial")
public abstract class PullRequestJobsPanel extends GenericPanel<List<JobBuildInfo>> {
@@ -44,28 +45,22 @@ public abstract class PullRequestJobsPanel extends GenericPanel<List<JobBuildInf
@Override
protected List<JobBuildInfo> load() {
- List<JobBuildInfo> listOfJobBuildInfo = new ArrayList<>();
- PullRequest request = getPullRequest();
- Map<String, List<Build>> map = new HashMap<>();
- for (Build build : request.getCurrentBuilds()) {
- String jobName = build.getJobName();
- List<Build> list = map.get(jobName);
- if (list == null) {
- list = new ArrayList<>();
- map.put(jobName, list);
- }
- list.add(build);
- }
- for (Map.Entry<String, List<Build>> entry : map.entrySet()) {
- String jobName = entry.getKey();
+ var listOfJobBuildInfo = new ArrayList<JobBuildInfo>();
+ var request = getPullRequest();
+
+ var map = new HashMap<String, List<Build>>();
+ for (var build : request.getCurrentBuilds())
+ map.computeIfAbsent(build.getJobName(), k -> new ArrayList<>()).add(build);
+ for (var entry : map.entrySet()) {
+ var jobName = entry.getKey();
if (SecurityUtils.canAccessJob(getPullRequest().getTargetProject(), jobName)) {
- List<Build> builds = new ArrayList<>(entry.getValue());
+ var builds = new ArrayList<>(entry.getValue());
Collections.sort(builds);
- boolean required = getPullRequest().getBuildRequirement().getRequiredJobs().contains(jobName);
+ var required = getPullRequest().getBuildRequirement().getRequiredJobs().contains(jobName);
listOfJobBuildInfo.add(new JobBuildInfo(jobName, required, builds));
}
}
- Collections.sort(listOfJobBuildInfo, (Comparator<JobBuildInfo>) (o1, o2) -> o1.getBuilds().iterator().next().getId().compareTo(o2.getBuilds().iterator().next().getId()));
+ Collections.sort(listOfJobBuildInfo, comparing((JobBuildInfo o) -> o.getBuilds().iterator().next().getId()));
return listOfJobBuildInfo;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewRequirementBehavior.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewRequirementBehavior.java
index a39fbb768e..a370f260fb 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewRequirementBehavior.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewRequirementBehavior.java
@@ -93,11 +93,8 @@ public class ReviewRequirementBehavior extends ANTLRAssistBehavior {
protected Optional<String> describe(ParseExpect parseExpect, String suggestedLiteral) {
String description;
switch (suggestedLiteral) {
- case "all":
- description = "require reviews from all members of the group";
- break;
case ":":
- description = "number of required reviews from the group";
+ description = "number of required reviewers from the group";
break;
case " ":
description = "space";
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.html
index ce65842c72..2629b995dd 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.html
@@ -91,7 +91,7 @@
<div class="text-muted form-text">Pull request can only be merged after getting approvals from all reviewers</div>
</div>
<div class="form-group">
- <label>Assignees</label>
+ <label>Assignees <a wicket:id="assignToMe" class="ml-2 font-weight-normal font-size-sm">assign to me</a></label>
<div wicket:id="assignees"></div>
<div class="text-muted form-text">Assignees have code write permission and will be responsible for merging the pull request</div>
</div>
diff --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.java
index 3eec38dc7f..ad2f05ae38 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
@@ -59,6 +59,7 @@ import org.apache.wicket.RestartResponseAtInterceptPageException;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
import org.apache.wicket.ajax.form.OnChangeAjaxBehavior;
+import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.extensions.ajax.markup.html.AjaxLazyLoadPanel;
import org.apache.wicket.feedback.FencedFeedbackPanel;
@@ -122,6 +123,10 @@ public class NewPullRequestPage extends ProjectPage implements RevisionAnnotatio
private WhitespaceOption whitespaceOption = WhitespaceOption.IGNORE_TRAILING;
+ private Component assignToMeLink;
+
+ private Component assigneesContainer;
+
public static PageParameters paramsOf(Project project, ProjectAndBranch target, ProjectAndBranch source) {
PageParameters params = paramsOf(project);
if (target.getBranch() != null)
@@ -232,23 +237,14 @@ public class NewPullRequestPage extends ProjectPage implements RevisionAnnotatio
getPullRequestManager().checkReviews(request, false);
- if (SecurityUtils.canWriteCode(target.getProject())) {
+ for (var assignee: target.getProject().findDefaultPullRequestAssignees()) {
PullRequestAssignment assignment = new PullRequestAssignment();
assignment.setRequest(request);
- assignment.setUser(SecurityUtils.getAuthUser());
+ assignment.setUser(assignee);
request.getAssignments().add(assignment);
- } else {
- for (UserAuthorization authorization: target.getProject().getUserAuthorizations()) {
- if (authorization.getRole().isOwner()) {
- PullRequestAssignment assignment = new PullRequestAssignment();
- assignment.setRequest(request);
- assignment.setUser(authorization.getUser());
- request.getAssignments().add(assignment);
- }
- }
}
- request.setMergeStrategy(target.getProject().findDefaultMergeStrategy());
+ request.setMergeStrategy(target.getProject().findDefaultPullRequestMergeStrategy());
}
requestModel = new LoadableDetachableModel<>() {
@@ -755,14 +751,39 @@ public class NewPullRequestPage extends ProjectPage implements RevisionAnnotatio
}
});
- form.add(new AssignmentListPanel("assignees") {
+ form.add(assigneesContainer = new AssignmentListPanel("assignees") {
@Override
protected PullRequest getPullRequest() {
return NewPullRequestPage.this.getPullRequest();
}
-
+
+ @Override
+ protected void onAssignmentsChanged(AjaxRequestTarget target) {
+ super.onAssignmentsChanged(target);
+ target.add(assignToMeLink);
+ }
});
+ form.add(assignToMeLink = new AjaxLink<Void>("assignToMe") {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ var assignment = new PullRequestAssignment();
+ assignment.setUser(SecurityUtils.getUser());
+ assignment.setRequest(getPullRequest());
+ getPullRequest().getAssignments().add(assignment);
+ target.add(this);
+ target.add(assigneesContainer);
+ }
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setVisible(!getPullRequest().getAssignees().contains(SecurityUtils.getUser())
+ && SecurityUtils.canWriteCode(getProject()));
+ }
+
+ }.setOutputMarkupPlaceholderTag(true));
return fragment;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html
index 596cc4106f..a019146668 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html
@@ -100,13 +100,13 @@
</div>
</div>
<div wicket:id="requestOperations" class="operations">
- <a wicket:id="merge" class="btn btn-sm btn-light btn-hover-primary">Merge</a>
- <a wicket:id="discard" class="btn btn-sm btn-light btn-hover-primary">Discard</a>
- <a wicket:id="approve" class="btn btn-sm btn-light btn-hover-primary">Approve</a>
- <a wicket:id="requestForChanges" class="btn btn-sm btn-light btn-hover-primary">Request For Changes</a>
- <a wicket:id="reopen" class="btn btn-sm btn-light btn-hover-primary">Reopen</a>
- <a wicket:id="deleteSourceBranch" class="btn btn-sm btn-light btn-hover-primary">Delete Source Branch</a>
- <a wicket:id="restoreSourceBranch" class="btn btn-sm btn-light btn-hover-primary">Restore Source Branch</a>
+ <a wicket:id="merge" class="btn btn-sm btn-light-success btn-hover-success">Merge</a>
+ <a wicket:id="discard" class="btn btn-sm btn-light-info btn-hover-info">Discard</a>
+ <a wicket:id="approve" class="btn btn-sm btn-light-success btn-hover-success">Approve</a>
+ <a wicket:id="requestForChanges" class="btn btn-sm btn-light-warning btn-hover-warning">Request For Changes</a>
+ <a wicket:id="reopen" class="btn btn-sm btn-light-primary btn-hover-primary">Reopen</a>
+ <a wicket:id="deleteSourceBranch" class="btn btn-sm btn-light-primary btn-hover-primary">Delete Source Branch</a>
+ <a wicket:id="restoreSourceBranch" class="btn btn-sm btn-light-primary btn-hover-primary">Restore Source Branch</a>
</div>
<ul wicket:id="requestTabs" class="tabs nav nav-tabs nav-tabs-line nav-bold mb-5 mt-3 align-items-center"></ul>
<wicket:child></wicket:child>
@@ -158,7 +158,7 @@
</wicket:enclosure>
<wicket:enclosure child="assignments">
<div class="assignments">
- <div class="head">Assignees</div>
+ <div class="head d-flex"><span class="mr-2">Assignees</span> <a wicket:id="assignToMe" class="ml-auto font-size-sm font-weight-normal">assign to me</a></div>
<div wicket:id="assignments" class="body"></div>
<div wicket:id="assigneeHelp" class="font-size-sm text-muted form-text">Assignees are expected to merge the pull request</div>
</div>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java
index ca67e7c13f..42443b6459 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java
@@ -176,6 +176,10 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
return OneDev.getInstance(PullRequestReviewManager.class);
}
+ private PullRequestAssignmentManager getPullRequestAssignmentManager() {
+ return OneDev.getInstance(PullRequestAssignmentManager.class);
+ }
+
private WebMarkupContainer newRequestHead() {
WebMarkupContainer requestHead = new WebMarkupContainer("requestHeader");
requestHead.setOutputMarkupId(true);
@@ -551,7 +555,7 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
PullRequest request = getPullRequest();
if (request.isOpen()) {
BuildRequirement buildRequirement = request.getBuildRequirement();
- if (buildRequirement.isStictMode() && request.isBuildCommitOutdated()) {
+ if (buildRequirement.isStrictMode() && request.isBuildCommitOutdated()) {
setVisible(false);
} else {
var requiredJobs = buildRequirement.getRequiredJobs();
@@ -573,7 +577,7 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
PullRequest request = getPullRequest();
if (request.isOpen()) {
BuildRequirement buildRequirement = request.getBuildRequirement();
- if (buildRequirement.isStictMode() && request.isBuildCommitOutdated()) {
+ if (buildRequirement.isStrictMode() && request.isBuildCommitOutdated()) {
setVisible(false);
} else {
var requiredJobs = buildRequirement.getRequiredJobs();
@@ -616,7 +620,7 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
summaryContainer.add(new Label("requiredJobsMessage", new AbstractReadOnlyModel<String>() {
@Override
public String getObject() {
- if (getPullRequest().getBuildRequirement().isStictMode())
+ if (getPullRequest().getBuildRequirement().isStrictMode())
return "Jobs required to be successful on merge commit: ";
else
return "Jobs required to be successful: ";
@@ -628,7 +632,7 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
PullRequest request = getPullRequest();
BuildRequirement buildRequirement = request.getBuildRequirement();
List<String> requiredJobs = new ArrayList<>(buildRequirement.getRequiredJobs());
- if (!buildRequirement.isStictMode() || !request.isBuildCommitOutdated()) {
+ if (!buildRequirement.isStrictMode() || !request.isBuildCommitOutdated()) {
for (Build build: request.getCurrentBuilds())
requiredJobs.remove(build.getJobName());
}
@@ -644,7 +648,7 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
PullRequest request = getPullRequest();
String commitHash;
- if (request.getBuildRequirement().isStictMode() || request.getBuildCommitHash() == null)
+ if (request.getBuildRequirement().isStrictMode() || request.getBuildCommitHash() == null)
commitHash = request.checkMergePreview().getMergeCommitHash();
else
commitHash = request.getBuildCommitHash();
@@ -950,6 +954,28 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
}
});
+ fragment.add(new AjaxLink<Void>("assignToMe") {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ var assignment = new PullRequestAssignment();
+ assignment.setRequest(getPullRequest());
+ assignment.setUser(SecurityUtils.getUser());
+ OneDev.getInstance(PullRequestAssignmentManager.class).create(assignment);
+ ((BasePage)getPage()).notifyObservableChange(target,
+ PullRequest.getChangeObservable(getPullRequest().getId()));
+ }
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setVisible(!getPullRequest().isMerged()
+ && SecurityUtils.getUser() != null
+ && !getPullRequest().getAssignees().contains(SecurityUtils.getUser())
+ && SecurityUtils.canWriteCode(getProject())
+ && SecurityUtils.canModifyPullRequest(getPullRequest()));
+ }
+ });
fragment.add(new AssignmentListPanel("assignments") {
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.css b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.css
index de59d9f092..8474e2188d 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.css
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.css
@@ -62,7 +62,7 @@ ul>li>a.code-comments.new .icon {
margin-bottom: 0;
}
-@media(min-width: 1200px) {
+@media(min-width: 992px) {
.pull-request-detail>.card-body>.main>.summary .more-info,
.pull-request-detail>.card-body>.main>.summary .more-info:hover,
.pull-request-detail>.card-body>.main>.summary .more-info:focus {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/code/analysis/CodeAnalysisSettingPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/code/analysis/CodeAnalysisSettingPage.java
index 1dffe69611..6e94337f90 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/code/analysis/CodeAnalysisSettingPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/code/analysis/CodeAnalysisSettingPage.java
@@ -50,7 +50,7 @@ public class CodeAnalysisSettingPage extends ProjectSettingPage {
@Override
protected Component newProjectTitle(String componentId) {
- return new Label(componentId, "<span class='text-truncate'>Code Analysis Setting</span>").setEscapeModelStrings(false);
+ return new Label(componentId, "<span class='text-truncate'>Code Analysis Settings</span>").setEscapeModelStrings(false);
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/code/pullrequest/PullRequestSettingPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/code/pullrequest/PullRequestSettingPage.java
index e828adace5..9a8f6b86e7 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/code/pullrequest/PullRequestSettingPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/code/pullrequest/PullRequestSettingPage.java
@@ -48,7 +48,7 @@ public class PullRequestSettingPage extends ProjectSettingPage {
@Override
protected Component newProjectTitle(String componentId) {
- return new Label(componentId, "<span class='text-truncate'>Pull Request Setting</span>").setEscapeModelStrings(false);
+ return new Label(componentId, "<span class='text-truncate'>Pull Request Settings</span>").setEscapeModelStrings(false);
}
@Override