Skip to content

The Unified and Autonomous Development Platform

Fix minor issue query bug

Robin Shen54914ee501b9
diff --git a/core/src/main/java/io/onedev/server/model/Project.java b/core/src/main/java/io/onedev/server/model/Project.java
index f286ab3311..d47d0560de 100644
--- a/core/src/main/java/io/onedev/server/model/Project.java
+++ b/core/src/main/java/io/onedev/server/model/Project.java
@@ -74,6 +74,7 @@ import io.onedev.server.git.command.BlameCommand;
import io.onedev.server.git.exception.NotFileException;
import io.onedev.server.git.exception.ObjectNotFoundException;
import io.onedev.server.manager.ConfigManager;
+import io.onedev.server.manager.IssueQuerySettingManager;
import io.onedev.server.manager.ProjectManager;
import io.onedev.server.manager.StorageManager;
import io.onedev.server.manager.UserManager;
@@ -201,6 +202,8 @@ public class Project extends AbstractEntity {
private transient Optional<RevCommit> lastCommitOptional;
+ private transient Optional<IssueQuerySetting> issueQuerySettingOfCurrentUser;
+
public Project() {
issueListFields.add("Type");
issueListFields.add("Priority");
@@ -209,8 +212,8 @@ public class Project extends AbstractEntity {
savedIssueQueries.add(new NamedQuery("All", "all"));
savedIssueQueries.add(new NamedQuery("Outstanding", "\"State\" is not \"Closed\""));
savedIssueQueries.add(new NamedQuery("Closed", "\"State\" is \"Closed\""));
- savedIssueQueries.add(new NamedQuery("Added recently", "\"Submit Date\" is after \"one week ago\""));
- savedIssueQueries.add(new NamedQuery("Updated recently", "\"Update Date\" is after \"one week ago\""));
+ savedIssueQueries.add(new NamedQuery("Added recently", "\"Submit Date\" is after \"last week\""));
+ savedIssueQueries.add(new NamedQuery("Updated recently", "\"Update Date\" is after \"last week\""));
savedIssueQueries.add(new NamedQuery("Submitted by me", "\"Submitter\" is me"));
savedIssueQueries.add(new NamedQuery("Assigned to me", "\"Assignee\" is me"));
savedIssueQueries.add(new NamedQuery("Hight Priority", "\"Priority\" is \"High\""));
@@ -985,4 +988,20 @@ public class Project extends AbstractEntity {
return authors;
}
+ @Nullable
+ public IssueQuerySetting getIssueQuerySettingOfCurrentUser() {
+ if (issueQuerySettingOfCurrentUser == null) {
+ User currentUser = SecurityUtils.getUser();
+ if (currentUser != null)
+ issueQuerySettingOfCurrentUser = Optional.fromNullable(OneDev.getInstance(IssueQuerySettingManager.class).find(this, currentUser));
+ else
+ issueQuerySettingOfCurrentUser = Optional.absent();
+ }
+ return issueQuerySettingOfCurrentUser.orNull();
+ }
+
+ public void setIssueQuerySettingOfCurrentUser(IssueQuerySetting setting) {
+ issueQuerySettingOfCurrentUser = Optional.fromNullable(setting);
+ }
+
}
diff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/IssueQuery.g4 b/core/src/main/java/io/onedev/server/model/support/issue/query/IssueQuery.g4
index b915f590d6..6f75b33bf5 100644
--- a/core/src/main/java/io/onedev/server/model/support/issue/query/IssueQuery.g4
+++ b/core/src/main/java/io/onedev/server/model/support/issue/query/IssueQuery.g4
@@ -1,15 +1,14 @@
grammar IssueQuery;
query
- : WS* criteria WS+ OrderBy WS+ order (WS+ 'and' WS+ order)* WS* EOF
- | WS* criteria WS* EOF
+ : WS* (criteria|All) WS+ OrderBy WS+ order (WS+ 'and' WS+ order)* WS* EOF
+ | WS* (criteria|All) WS* EOF
| WS* OrderBy WS+ order (WS+ 'and' WS+ order)* WS* EOF
| WS* EOF
;
criteria
- : All #AllCriteria
- | Mine #MineCriteria
+ : Mine #MineCriteria
| criteriaField=Quoted WS+ operator=(IsMe|IsNotMe|IsEmpty|IsNotEmpty) #UnaryCriteria
| criteriaField=Quoted WS+ operator=(Is|IsNot|IsGreaterThan|IsLessThan|IsBefore|IsAfter|Contains|DoesNotContain) WS+ criteriaValue=Quoted #ValueCriteria
| criteria WS+ 'and' WS+ criteria #AndCriteria
diff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/IssueQuery.java b/core/src/main/java/io/onedev/server/model/support/issue/query/IssueQuery.java
index ef13811eac..dcdd3f2c92 100644
--- a/core/src/main/java/io/onedev/server/model/support/issue/query/IssueQuery.java
+++ b/core/src/main/java/io/onedev/server/model/support/issue/query/IssueQuery.java
@@ -38,7 +38,6 @@ import io.onedev.server.model.Issue;
import io.onedev.server.model.IssueFieldUnary;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
-import io.onedev.server.model.support.issue.query.IssueQueryParser.AllCriteriaContext;
import io.onedev.server.model.support.issue.query.IssueQueryParser.AndCriteriaContext;
import io.onedev.server.model.support.issue.query.IssueQueryParser.BracedCriteriaContext;
import io.onedev.server.model.support.issue.query.IssueQueryParser.CriteriaContext;
@@ -229,11 +228,6 @@ public class IssueQuery implements Serializable {
}
}
- @Override
- public IssueCriteria visitAllCriteria(AllCriteriaContext ctx) {
- return null;
- }
-
@Override
public IssueCriteria visitUnaryCriteria(UnaryCriteriaContext ctx) {
String fieldName = getValue(ctx.Quoted().getText());
diff --git a/core/src/main/java/io/onedev/server/web/component/link/FirstIssueQueryLink.java b/core/src/main/java/io/onedev/server/web/component/link/FirstIssueQueryLink.java
new file mode 100644
index 0000000000..f390a55b5f
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/component/link/FirstIssueQueryLink.java
@@ -0,0 +1,43 @@
+package io.onedev.server.web.component.link;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+
+import io.onedev.server.model.Project;
+import io.onedev.server.model.support.issue.NamedQuery;
+import io.onedev.server.model.support.issue.query.IssueQuery;
+import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.web.page.project.issues.issuelist.IssueListPage;
+
+public class FirstIssueQueryLink extends ViewStateAwarePageLink<Void> {
+
+ private static final long serialVersionUID = 1L;
+
+ public FirstIssueQueryLink(String id, Project project) {
+ super(id, IssueListPage.class, getPageParameters(project));
+ }
+
+ private static PageParameters getPageParameters(Project project) {
+ String query = null;
+ List<String> queries = new ArrayList<>();
+ if (project.getIssueQuerySettingOfCurrentUser() != null) {
+ for (NamedQuery namedQuery: project.getIssueQuerySettingOfCurrentUser().getUserQueries())
+ queries.add(namedQuery.getQuery());
+ }
+ for (NamedQuery namedQuery: project.getSavedIssueQueries())
+ queries.add(namedQuery.getQuery());
+ for (String each: queries) {
+ try {
+ if (SecurityUtils.getUser() != null || !IssueQuery.parse(project, each, true).needsLogin()) {
+ query = each;
+ break;
+ }
+ } catch (Exception e) {
+ }
+ }
+ return IssueListPage.paramsOf(project, query);
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java b/core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java
index 39eb96fe4b..3b6d3c421f 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java
@@ -27,17 +27,14 @@ import org.eclipse.jgit.lib.ObjectId;
import com.google.common.base.Preconditions;
import io.onedev.server.OneDev;
-import io.onedev.server.manager.IssueQuerySettingManager;
import io.onedev.server.manager.ProjectManager;
import io.onedev.server.manager.UserInfoManager;
-import io.onedev.server.model.IssueQuerySetting;
import io.onedev.server.model.Project;
-import io.onedev.server.model.support.issue.NamedQuery;
-import io.onedev.server.model.support.issue.query.IssueQuery;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.web.ComponentRenderer;
import io.onedev.server.web.component.floating.FloatingPanel;
import io.onedev.server.web.component.link.DropdownLink;
+import io.onedev.server.web.component.link.FirstIssueQueryLink;
import io.onedev.server.web.component.link.ViewStateAwarePageLink;
import io.onedev.server.web.component.sidebar.SideBar;
import io.onedev.server.web.component.tabbable.PageTab;
@@ -69,15 +66,6 @@ public abstract class ProjectPage extends LayoutPage {
protected final IModel<Project> projectModel;
- protected final IModel<IssueQuerySetting> issueQuerySettingModel = new LoadableDetachableModel<IssueQuerySetting>() {
-
- @Override
- protected IssueQuerySetting load() {
- return OneDev.getInstance(IssueQuerySettingManager.class).find(getProject(), getLoginUser());
- }
-
- };
-
public static PageParameters paramsOf(Project project) {
PageParameters params = new PageParameters();
params.set(PARAM_PROJECT, project.getName());
@@ -165,28 +153,7 @@ public abstract class ProjectPage extends LayoutPage {
@Override
protected Link<?> newLink(String linkId, Class<? extends Page> pageClass) {
- String query = null;
- List<String> queries = new ArrayList<>();
- if (getLoginUser() != null) {
- IssueQuerySetting setting = getIssueQuerySetting();
- if (setting != null) {
- for (NamedQuery namedQuery: setting.getUserQueries())
- queries.add(namedQuery.getQuery());
- }
- }
- for (NamedQuery namedQuery: getProject().getSavedIssueQueries())
- queries.add(namedQuery.getQuery());
- for (String each: queries) {
- try {
- if (getLoginUser() != null || !IssueQuery.parse(getProject(), each, true).needsLogin()) {
- query = each;
- break;
- }
- } catch (Exception e) {
- }
- }
- PageParameters params = IssueListPage.paramsOf(getProject(), query);
- return new ViewStateAwarePageLink<Void>(linkId, IssueListPage.class, params);
+ return new FirstIssueQueryLink(linkId, getProject());
}
};
}
@@ -227,14 +194,9 @@ public abstract class ProjectPage extends LayoutPage {
return projectModel.getObject();
}
- protected IssueQuerySetting getIssueQuerySetting() {
- return issueQuerySettingModel.getObject();
- }
-
@Override
protected void onDetach() {
projectModel.detach();
- issueQuerySettingModel.detach();
super.onDetach();
}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/IssuesPage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/IssuesPage.java
index 33249b5043..6b2ec8bd8c 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/IssuesPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/IssuesPage.java
@@ -15,6 +15,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
import io.onedev.server.model.Project;
import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.web.component.link.FirstIssueQueryLink;
import io.onedev.server.web.component.link.ViewStateAwarePageLink;
import io.onedev.server.web.component.modal.ModalLink;
import io.onedev.server.web.component.modal.ModalPanel;
@@ -94,7 +95,21 @@ public abstract class IssuesPage extends ProjectPage {
}
List<Tab> tabs = new ArrayList<>();
- tabs.add(new IssuesTab("List", IssueListPage.class));
+ tabs.add(new IssuesTab("List", IssueListPage.class) {
+
+ @Override
+ public Component render(String componentId) {
+ return new PageTabLink(componentId, this) {
+
+ @Override
+ protected Link<?> newLink(String linkId, Class<? extends Page> pageClass) {
+ return new FirstIssueQueryLink(linkId, getProject());
+ }
+ };
+
+ }
+
+ });
tabs.add(new IssuesTab("Boards", IssueBoardsPage.class));
add(new Tabbable("issuesTabs", tabs));
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 fbfaa5b850..0ec4055456 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
@@ -114,6 +114,11 @@ 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();
@@ -180,7 +185,7 @@ public class IssueListPage extends IssuesPage {
setting = new IssueQuerySetting();
setting.setProject(getProject());
setting.setUser(getLoginUser());
- issueQuerySettingModel.setObject(setting);
+ getProject().setIssueQuerySettingOfCurrentUser(setting);
}
NamedQuery namedQuery = setting.getUserQuery(bean.getName());
if (namedQuery == null) {
diff --git a/product/system/conf/logback.xml b/product/system/conf/logback.xml
index 9c01393196..c4877110df 100644
--- a/product/system/conf/logback.xml
+++ b/product/system/conf/logback.xml
@@ -33,6 +33,7 @@
<logger name="org.hibernate.engine.jdbc.internal.JdbcCoordinatorImpl" level="ERROR"/>
<logger name="org.reflections" level="WARN"/>
<logger name="org.apache.shiro.realm.AuthorizingRealm" level="WARN"/>
+ <logger name="com.joestelmach.natty" level="WARN"/>
<logger name="jetbrains.exodus" level="WARN"/>
<logger name="jetbrains.exodus.io.FileDataWriter" level="ERROR"/>
<logger name="com.zaxxer.hikari.HikariDataSource" level="ERROR"/>