Skip to content

The Unified and Autonomous Development Platform

More review process improvement

Robin Shen0d184c7f1a7d
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java
index ed9bc0d86a..ff01d701b4 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java
@@ -751,6 +751,12 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest> im
unpreferableReviewers.add(request.getSubmitter());
BranchProtection branchProtection = request.getTargetProject().getBranchProtection(
request.getTargetBranch(), request.getSubmitter());
+
+ ReviewRequirement reviewRequirement = branchProtection.getParsedReviewRequirement();
+ for (PullRequestReview review: request.getReviews()) {
+ if (!reviewRequirement.getUsers().contains(review.getUser()))
+ reviewRequirement.getUsers().add(review.getUser());
+ }
checkReviews(branchProtection.getParsedReviewRequirement(), request.getLatestUpdate(), unpreferableReviewers);
ReviewRequirement checkedRequirement = ReviewRequirement.parse(null, true);
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/CommentableOperationConfirmPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/CommentableOperationConfirmPanel.java
index 3a4d2d5f50..bcf2f0be9f 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/CommentableOperationConfirmPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/CommentableOperationConfirmPanel.java
@@ -63,5 +63,5 @@ public abstract class CommentableOperationConfirmPanel extends OperationConfirmP
protected final String getComment() {
return comment;
}
-
+
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/OperationConfirmPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/OperationConfirmPanel.java
index 02407939a3..c1c3e0d3f1 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/OperationConfirmPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/OperationConfirmPanel.java
@@ -112,6 +112,13 @@ public abstract class OperationConfirmPanel extends Panel {
target.add(form);
latestUpdateId = request.getLatestUpdate().getId();
}
+
+ target.prependJavaScript(String.format("$('#%s').data('dirty', $('#%s').hasClass('dirty'))",
+ OperationConfirmPanel.this.getMarkupId(), form.getMarkupId()));
+ target.appendJavaScript(String.format(""
+ + "if ($('#%s').data('dirty')) "
+ + " onedev.server.form.markDirty($('#%s'))",
+ OperationConfirmPanel.this.getMarkupId(), form.getMarkupId()));
}
@Override
@@ -121,6 +128,8 @@ public abstract class OperationConfirmPanel extends Panel {
}
});
+
+ setOutputMarkupId(true);
}
@Override