The Unified and Autonomous Development Platform
Fix issue #1112 - Project is current doesn't work for saved queries
Robin Shenf67740cb8158
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/NamedIssueQuery.java b/server-core/src/main/java/io/onedev/server/model/support/issue/NamedIssueQuery.javaindex 486949b4a8..acf44dff46 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/NamedIssueQuery.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/NamedIssueQuery.java@@ -35,7 +35,7 @@ public class NamedIssueQuery implements NamedQuery {}@Editable(placeholder="All")- @IssueQuery(withCurrentUserCriteria = true)+ @IssueQuery(withCurrentUserCriteria = true, withCurrentProjectCriteria = true)@Overridepublic String getQuery() {return query;diff --git a/server-core/src/main/java/io/onedev/server/util/validation/IssueQueryValidator.java b/server-core/src/main/java/io/onedev/server/util/validation/IssueQueryValidator.javaindex f186ab9de9..03c4cc1009 100644--- a/server-core/src/main/java/io/onedev/server/util/validation/IssueQueryValidator.java+++ b/server-core/src/main/java/io/onedev/server/util/validation/IssueQueryValidator.java@@ -12,6 +12,8 @@ public class IssueQueryValidator implements ConstraintValidator<IssueQuery, Striprivate String message;+ private boolean withCurrentProjectCriteria;+private boolean withCurrentUserCriteria;private boolean withCurrentBuildCriteria;@@ -25,6 +27,7 @@ public class IssueQueryValidator implements ConstraintValidator<IssueQuery, Stri@Overridepublic void initialize(IssueQuery constaintAnnotation) {message = constaintAnnotation.message();+ withCurrentProjectCriteria = constaintAnnotation.withCurrentProjectCriteria();withCurrentUserCriteria = constaintAnnotation.withCurrentUserCriteria();withCurrentBuildCriteria = constaintAnnotation.withCurrentBuildCriteria();withCurrentPullRequestCriteria = constaintAnnotation.withCurrentPullRequestCriteria();@@ -40,6 +43,7 @@ public class IssueQueryValidator implements ConstraintValidator<IssueQuery, StriProject project = Project.get();try {IssueQueryParseOption option = new IssueQueryParseOption()+ .withCurrentProjectCriteria(withCurrentProjectCriteria).withCurrentUserCriteria(withCurrentUserCriteria).withCurrentBuildCriteria(withCurrentBuildCriteria).withCurrentCommitCriteria(withCurrentCommitCriteria)