Skip to content

The Unified and Autonomous Development Platform

Fix duplicating error message issue in various queries

Robin Shen53e9e161c480
diff --git a/server-core/src/main/java/io/onedev/server/persistence/DefaultDataManager.java b/server-core/src/main/java/io/onedev/server/persistence/DefaultDataManager.java
index 22a481b2e3..1a95b3d458 100644
--- a/server-core/src/main/java/io/onedev/server/persistence/DefaultDataManager.java
+++ b/server-core/src/main/java/io/onedev/server/persistence/DefaultDataManager.java
@@ -743,41 +743,6 @@ public class DefaultDataManager implements DataManager, Serializable {
}
}
- if (userManager.get(User.ROOT_ID) == null) {
- manualConfigs.add(new ManualConfig("Create Administrator Account", null, new NewUserBean()) {
-
- @Override
- public void complete() {
- NewUserBean newUserBean = (NewUserBean) getSetting();
- User user = new User();
- user.setId(User.ROOT_ID);
- user.setName(newUserBean.getName());
- user.setFullName(newUserBean.getFullName());
- user.setPassword(passwordService.encryptPassword(newUserBean.getPassword()));
- userManager.replicate(user);
-
- EmailAddress primaryEmailAddress = null;
- for (EmailAddress emailAddress: emailAddressManager.query()) {
- if (emailAddress.getOwner().equals(user) && emailAddress.isPrimary()) {
- primaryEmailAddress = emailAddress;
- break;
- }
- }
-
- if (primaryEmailAddress == null) {
- primaryEmailAddress = new EmailAddress();
- primaryEmailAddress.setPrimary(true);
- primaryEmailAddress.setGit(true);
- primaryEmailAddress.setVerificationCode(null);
- primaryEmailAddress.setOwner(user);
- }
- primaryEmailAddress.setValue(newUserBean.getEmailAddress());
- emailAddressManager.save(primaryEmailAddress);
- }
-
- });
- }
-
Setting setting = settingManager.findSetting(Key.SYSTEM);
SystemSetting systemSetting = null;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java
index 7eb85d1487..047e8b1a92 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java
@@ -153,9 +153,11 @@ public abstract class BuildListPanel extends Panel {
try {
return BuildQuery.merge(baseQuery, BuildQuery.parse(getProject(), queryString, true, true));
} catch (ExplicitException e) {
+ getFeedbackMessages().clear();
error(e.getMessage());
return null;
} catch (Exception e) {
+ getFeedbackMessages().clear();
info("Performing fuzzy query");
try {
EntityQuery.getProjectScopedNumber(getProject(), queryString);
diff --git a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java
index 78487e109f..ed4167ccad 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java
@@ -100,13 +100,16 @@ public abstract class CodeCommentListPanel extends Panel {
try {
return CodeCommentQuery.parse(getProject(), queryString, true);
} catch (ExplicitException e) {
+ getFeedbackMessages().clear();
error(e.getMessage());
return null;
} catch (Exception e) {
if (getPullRequest() != null) {
+ getFeedbackMessages().clear();
error("Malformed code comment query");
return null;
} else {
+ getFeedbackMessages().clear();
info("Performing fuzzy query");
return queryString;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java
index eb59e46829..35c94003b4 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java
@@ -108,9 +108,11 @@ public abstract class CommitListPanel extends Panel {
try {
return CommitQuery.merge(getBaseQuery(), CommitQuery.parse(getProject(), queryString, true));
} catch (ExplicitException e) {
+ getFeedbackMessages().clear();
error(e.getMessage());
return null;
} catch (Exception e) {
+ getFeedbackMessages().clear();
info("Performing fuzzy query");
List<CommitCriteria> criterias = new ArrayList<>();
ObjectId commitId = getProject().getObjectId(queryString, false);
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
index 34d849d107..a3d41a9192 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
@@ -181,12 +181,15 @@ public abstract class IssueListPanel extends Panel {
return IssueQuery.merge(baseQuery, IssueQuery.parse(getProject(), queryString, option, true));
} catch (Exception e) {
if (e instanceof ExplicitException) {
+ getFeedbackMessages().clear();
error(e.getMessage());
return null;
} else if (getBaseQuery().toString() != null) {
+ getFeedbackMessages().clear();
error("Malformed issue query");
return null;
} else {
+ getFeedbackMessages().clear();
info("Performing fuzzy query");
return queryString;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java
index 6e3654fca5..6c0a1eda65 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java
@@ -1198,9 +1198,11 @@ public class ProjectListPanel extends Panel {
try {
return ProjectQuery.merge(baseQuery, ProjectQuery.parse(queryString));
} catch (ExplicitException e) {
+ getFeedbackMessages().clear();
error(e.getMessage());
return null;
} catch (Exception e) {
+ getFeedbackMessages().clear();
info("Performing fuzzy query");
if (getParentProject() != null) {
queryString = "*" + queryString.replace(" ", "*") + "*";
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java
index a40af846df..6462b2a5f4 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java
@@ -154,13 +154,16 @@ public abstract class PullRequestListPanel extends Panel {
try {
return PullRequestQuery.merge(baseQuery, PullRequestQuery.parse(getProject(), queryString, true));
} catch (ExplicitException e) {
+ getFeedbackMessages().clear();
error(e.getMessage());
return null;
} catch (Exception e) {
if (getBaseQuery().toString() != null) {
+ getFeedbackMessages().clear();
error("Malformed query");
return null;
} else {
+ getFeedbackMessages().clear();
info("Performing fuzzy query");
return queryString;
}