Skip to content

The Unified and Autonomous Development Platform

fix: Branch protection rules don't seem to work properly for multiple File Protections (OD-2478)

Robin Shen082cd13eede1
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 08e25cddab..f35a21a575 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
@@ -858,7 +858,7 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest>
});
for (PullRequestReview review: reviews) {
- if (review.getStatus() == PullRequestReview.Status.EXCLUDED) {
+ if (users.contains(review.getUser()) && review.getStatus() == PullRequestReview.Status.EXCLUDED) {
reviewers.add(review.getUser());
review.setStatus(PullRequestReview.Status.PENDING);
if (reviewers.size() == requiredCount)
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewListPanel.java
index f8d77648e9..5dcb93b1ce 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewListPanel.java
@@ -1,6 +1,23 @@
package io.onedev.server.web.component.pullrequest.review;
+import java.util.Collection;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
+import org.apache.wicket.ajax.markup.html.AjaxLink;
+import org.apache.wicket.markup.ComponentTag;
+import org.apache.wicket.markup.head.CssHeaderItem;
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.html.list.ListItem;
+import org.apache.wicket.markup.html.list.ListView;
+import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.LoadableDetachableModel;
+
import com.google.common.collect.Sets;
+
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.PullRequestManager;
import io.onedev.server.entitymanager.PullRequestReviewManager;
@@ -14,21 +31,6 @@ import io.onedev.server.web.behavior.ChangeObserver;
import io.onedev.server.web.component.user.ident.Mode;
import io.onedev.server.web.component.user.ident.UserIdentPanel;
import io.onedev.server.web.page.base.BasePage;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
-import org.apache.wicket.ajax.markup.html.AjaxLink;
-import org.apache.wicket.markup.ComponentTag;
-import org.apache.wicket.markup.head.CssHeaderItem;
-import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.html.list.ListItem;
-import org.apache.wicket.markup.html.list.ListView;
-import org.apache.wicket.markup.html.panel.Panel;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.LoadableDetachableModel;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.stream.Collectors;
public abstract class ReviewListPanel extends Panel {
@@ -74,6 +76,7 @@ public abstract class ReviewListPanel extends Panel {
@Override
protected void populateItem(ListItem<PullRequestReview> item) {
PullRequestReview review = item.getModelObject();
+ var reviewId = review.getId();
item.add(new UserIdentPanel("user", review.getUser(), Mode.AVATAR_AND_NAME));
PullRequest request = getPullRequest();
@@ -82,7 +85,7 @@ public abstract class ReviewListPanel extends Panel {
@Override
protected Status getStatus() {
- return item.getModelObject().getStatus();
+ return getReviewManager().load(reviewId).getStatus();
}
}.setVisible(!request.isNew()));
@@ -93,7 +96,7 @@ public abstract class ReviewListPanel extends Panel {
protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
super.updateAjaxAttributes(attributes);
- PullRequestReview review = item.getModelObject();
+ PullRequestReview review = getReviewManager().load(reviewId);
if (!review.getUser().equals(SecurityUtils.getAuthUser())) {
attributes.getAjaxCallListeners().add(new ConfirmClickListener("Do you really want to "
+ "request another review from '" + review.getUser().getDisplayName() + "'?"));
@@ -103,13 +106,13 @@ public abstract class ReviewListPanel extends Panel {
@Override
protected void onComponentTag(ComponentTag tag) {
super.onComponentTag(tag);
- if (review.getUser().equals(SecurityUtils.getAuthUser()))
+ if (getReviewManager().load(reviewId).getUser().equals(SecurityUtils.getAuthUser()))
tag.put("title", "Reset my review");
}
@Override
public void onClick(AjaxRequestTarget target) {
- PullRequestReview review = item.getModelObject();
+ PullRequestReview review = getReviewManager().load(reviewId);
review.setStatus(Status.PENDING);
OneDev.getInstance(PullRequestReviewManager.class).createOrUpdate(review);
notifyPullRequestChange(target);
@@ -119,7 +122,7 @@ public abstract class ReviewListPanel extends Panel {
protected void onConfigure() {
super.onConfigure();
- PullRequestReview review = item.getModelObject();
+ PullRequestReview review = getReviewManager().load(reviewId);
User currentUser = SecurityUtils.getAuthUser();
setVisible(!request.isNew()
&& request.isOpen()
@@ -135,15 +138,16 @@ public abstract class ReviewListPanel extends Panel {
protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
super.updateAjaxAttributes(attributes);
if (!getPullRequest().isNew()) {
+ var review = getReviewManager().load(reviewId);
attributes.getAjaxCallListeners().add(new ConfirmClickListener("Do you really want to "
- + "remove reviewer '" + item.getModelObject().getUser().getDisplayName() + "'?"));
+ + "remove reviewer '" + review.getUser().getDisplayName() + "'?"));
}
}
@Override
public void onClick(AjaxRequestTarget target) {
PullRequest request = getPullRequest();
- PullRequestReview review = item.getModelObject();
+ PullRequestReview review = getReviewManager().load(reviewId);
review.setStatus(Status.EXCLUDED);
OneDev.getInstance(PullRequestManager.class).checkReviews(request, false);
User reviewer = review.getUser();
@@ -217,6 +221,10 @@ public abstract class ReviewListPanel extends Panel {
setOutputMarkupId(true);
}
+ private PullRequestReviewManager getReviewManager() {
+ return OneDev.getInstance(PullRequestReviewManager.class);
+ }
+
@Override
public void renderHead(IHeaderResponse response) {
super.renderHead(response);