Skip to content

The Unified and Autonomous Development Platform

Fix some minor bugs

Robin Shencced232ce434
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueQuerySettingManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueQuerySettingManager.java
index 96acd81e22..f88f10007f 100644
--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueQuerySettingManager.java
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueQuerySettingManager.java
@@ -1,5 +1,7 @@
package io.onedev.server.manager.impl;
+import java.util.stream.Collectors;
+
import javax.inject.Inject;
import javax.inject.Singleton;
@@ -9,7 +11,6 @@ import io.onedev.server.manager.IssueQuerySettingManager;
import io.onedev.server.model.IssueQuerySetting;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
-import io.onedev.server.model.support.issue.NamedQuery;
import io.onedev.server.persistence.annotation.Sessional;
import io.onedev.server.persistence.annotation.Transactional;
import io.onedev.server.persistence.dao.AbstractEntityManager;
@@ -36,10 +37,10 @@ public class DefaultIssueQuerySettingManager extends AbstractEntityManager<Issue
@Transactional
@Override
public void save(IssueQuerySetting setting) {
- for (NamedQuery namedQuery: setting.getUserQueries())
- setting.getUserQueryWatches().remove(namedQuery.getName());
- for (NamedQuery namedQuery: setting.getProject().getSavedIssueQueries())
- setting.getProjectQueryWatches().remove(namedQuery.getName());
+ setting.getUserQueryWatches().keySet().retainAll(
+ setting.getUserQueries().stream().map(it->it.getName()).collect(Collectors.toSet()));
+ setting.getProjectQueryWatches().keySet().retainAll(
+ setting.getProject().getSavedIssueQueries().stream().map(it->it.getName()).collect(Collectors.toSet()));
if (setting.getProjectQueryWatches().isEmpty() && setting.getUserQueries().isEmpty()) {
if (!setting.isNew())
delete(setting);
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/IssueListPage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/IssueListPage.java
index b2b42b2a60..4b08854060 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/IssueListPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/IssueListPage.java
@@ -80,14 +80,9 @@ public class IssueListPage extends IssuesPage {
watches.remove(name);
}
- @Nullable
- private IssueQuerySetting getIssueQuerySetting() {
- return getProject().getIssueQuerySettingOfCurrentUser();
- }
-
private ArrayList<NamedQuery> getUserQueries() {
- if (getIssueQuerySetting() != null)
- return getIssueQuerySetting().getUserQueries();
+ if (getProject().getIssueQuerySettingOfCurrentUser() != null)
+ return getProject().getIssueQuerySettingOfCurrentUser().getUserQueries();
else
return new ArrayList<>();
}
@@ -126,7 +121,7 @@ public class IssueListPage extends IssuesPage {
@Override
protected void onSave(AjaxRequestTarget target, ArrayList<NamedQuery> queries) {
- IssueQuerySetting setting = getIssueQuerySetting();
+ IssueQuerySetting setting = getProject().getIssueQuerySettingOfCurrentUser();
if (setting == null) {
setting = new IssueQuerySetting();
setting.setProject(getProject());
@@ -256,7 +251,7 @@ public class IssueListPage extends IssuesPage {
@Override
protected void onWatchStatusChange(AjaxRequestTarget target, WatchStatus watchStatus) {
- IssueQuerySetting setting = getIssueQuerySetting();
+ IssueQuerySetting setting = getProject().getIssueQuerySettingOfCurrentUser();
if (setting == null) {
setting = new IssueQuerySetting();
setting.setProject(getProject());
@@ -269,7 +264,7 @@ public class IssueListPage extends IssuesPage {
@Override
protected WatchStatus getWatchStatus() {
- IssueQuerySetting setting = getIssueQuerySetting();
+ IssueQuerySetting setting = getProject().getIssueQuerySettingOfCurrentUser();
if (setting != null)
return IssueListPage.this.getWatchStatus(setting.getUserQueryWatches(), namedQuery.getName());
else
@@ -316,11 +311,12 @@ public class IssueListPage extends IssuesPage {
@Override
protected void onWatchStatusChange(AjaxRequestTarget target, WatchStatus watchStatus) {
- IssueQuerySetting setting = getIssueQuerySetting();
+ IssueQuerySetting setting = getProject().getIssueQuerySettingOfCurrentUser();
if (setting == null) {
setting = new IssueQuerySetting();
setting.setProject(getProject());
setting.setUser(getLoginUser());
+ getProject().setIssueQuerySettingOfCurrentUser(setting);
}
setWatchStatus(setting.getProjectQueryWatches(), namedQuery.getName(), watchStatus);
getIssueQuerySettingManager().save(setting);
@@ -329,7 +325,7 @@ public class IssueListPage extends IssuesPage {
@Override
protected WatchStatus getWatchStatus() {
- IssueQuerySetting setting = getIssueQuerySetting();
+ IssueQuerySetting setting = getProject().getIssueQuerySettingOfCurrentUser();
if (setting != null)
return IssueListPage.this.getWatchStatus(setting.getProjectQueryWatches(), namedQuery.getName());
else
@@ -424,7 +420,7 @@ public class IssueListPage extends IssuesPage {
@Override
protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
super.onSubmit(target, form);
- IssueQuerySetting setting = getIssueQuerySetting();
+ IssueQuerySetting setting = getProject().getIssueQuerySettingOfCurrentUser();
if (setting == null) {
setting = new IssueQuerySetting();
setting.setProject(getProject());
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/workflowreconcile/WorkflowReconcilePanel.html b/core/src/main/java/io/onedev/server/web/page/project/issues/workflowreconcile/WorkflowReconcilePanel.html
index 7f43aea95c..3198caba36 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/workflowreconcile/WorkflowReconcilePanel.html
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/workflowreconcile/WorkflowReconcilePanel.html
@@ -48,7 +48,7 @@
</div>
<table class="table table-condensed">
<thead>
- <tr><th>Field Name</th><th>Field Type</th><th>Resolution</th></tr>
+ <tr><th>Field Name</th><th>Resolution</th></tr>
</thead>
<tbody>
<tr wicket:id="rows">