The Unified and Autonomous Development Platform
Fix query save bug
Robin Shenc1a84bd41c35
diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalBuildSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalBuildSetting.javaindex ef2dc35db5..0292c63719 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalBuildSetting.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalBuildSetting.java@@ -20,12 +20,11 @@ public class GlobalBuildSetting implements Serializable {namedQueries.add(new NamedBuildQuery("All", "all"));namedQueries.add(new NamedBuildQuery("Successful", "successful"));namedQueries.add(new NamedBuildQuery("Failed", "failed"));- namedQueries.add(new NamedBuildQuery("In error", "in error"));namedQueries.add(new NamedBuildQuery("Cancelled", "cancelled"));namedQueries.add(new NamedBuildQuery("Timed out", "timed out"));namedQueries.add(new NamedBuildQuery("Running", "running"));namedQueries.add(new NamedBuildQuery("Waiting", "waiting"));- namedQueries.add(new NamedBuildQuery("Queueing", "queueing"));+ namedQueries.add(new NamedBuildQuery("Pending", "pending"));namedQueries.add(new NamedBuildQuery("Build recently", "\"Submit Date\" is after \"last week\""));}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/annotation/CodeCommentQuery.java b/server-core/src/main/java/io/onedev/server/web/editable/annotation/CodeCommentQuery.javaindex 1d8283330c..d360ac1898 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/annotation/CodeCommentQuery.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/annotation/CodeCommentQuery.java@@ -8,11 +8,11 @@ import java.lang.annotation.Target;import javax.validation.Constraint;import javax.validation.Payload;-import io.onedev.server.util.validation.PullRequestQueryValidator;+import io.onedev.server.util.validation.CodeCommentQueryValidator;@Target({ElementType.METHOD, ElementType.FIELD})@Retention(RetentionPolicy.RUNTIME)-@Constraint(validatedBy=PullRequestQueryValidator.class)+@Constraint(validatedBy=CodeCommentQueryValidator.class)public @interface CodeCommentQuery {String message() default "";diff --git a/server-core/src/main/java/io/onedev/server/web/page/build/BuildListPage.java b/server-core/src/main/java/io/onedev/server/web/page/build/BuildListPage.javaindex 6fbdaf8168..bcfe2d0207 100644--- a/server-core/src/main/java/io/onedev/server/web/page/build/BuildListPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/build/BuildListPage.java@@ -135,11 +135,6 @@ public class BuildListPage extends LayoutPage {OneDev.getInstance(SettingManager.class).saveBuildSetting(getBuildSetting());}- @Override- protected ArrayList<NamedBuildQuery> getDefaultQueries() {- return (ArrayList<NamedBuildQuery>) getBuildSetting().getNamedQueries();- }-});PagingHistorySupport pagingHistorySupport = new PagingHistorySupport() {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectListPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectListPage.javaindex 84ba28dd7d..9ab09915d5 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectListPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectListPage.java@@ -134,11 +134,6 @@ public class ProjectListPage extends LayoutPage {OneDev.getInstance(SettingManager.class).saveProjectSetting(getProjectSetting());}- @Override- protected ArrayList<NamedProjectQuery> getDefaultQueries() {- return (ArrayList<NamedProjectQuery>) getProjectSetting().getNamedQueries();- }-});PagingHistorySupport pagingHistorySupport = new PagingHistorySupport() {