The Unified and Autonomous Development Platform
Fix issue #702 - Pull request filter "to be reviewed by me" shows discarded pull requests
Robin Shen2a7cb23eac69
diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalPullRequestSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalPullRequestSetting.javaindex 7358857749..7f05b96228 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalPullRequestSetting.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalPullRequestSetting.java@@ -16,8 +16,8 @@ public class GlobalPullRequestSetting implements Serializable {public GlobalPullRequestSetting() {namedQueries.add(new NamedPullRequestQuery("Open", "open"));- namedQueries.add(new NamedPullRequestQuery("To be reviewed by me", "to be reviewed by me"));- namedQueries.add(new NamedPullRequestQuery("To be changed by me", "submitted by me and someone requested for changes"));+ namedQueries.add(new NamedPullRequestQuery("To be reviewed by me", "open and to be reviewed by me"));+ namedQueries.add(new NamedPullRequestQuery("To be changed by me", "open and submitted by me and someone requested for changes"));namedQueries.add(new NamedPullRequestQuery("Requested for changes by me", "requested for changes by me"));namedQueries.add(new NamedPullRequestQuery("Approved by me", "approved by me"));namedQueries.add(new NamedPullRequestQuery("Submitted by me", "submitted by me"));diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByCriteria.javaindex a27791d882..e7feab0e22 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByCriteria.java@@ -39,7 +39,7 @@ public class ToBeReviewedByCriteria extends Criteria<PullRequest> {@Overridepublic boolean matches(PullRequest request) {PullRequestReview review = request.getReview(user);- return review != null && review.getResult() == null || review.getResult().getApproved() == null;+ return review != null && (review.getResult() == null || review.getResult().getApproved() == null);}@Override