The Unified and Autonomous Development Platform
Able to display board card in board columns
robin shen5ce9c041a57c
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueManager.javaindex d67da8b374..129ccb02ef 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueManager.java+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueManager.java@@ -147,7 +147,7 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implementsList<Predicate> predicates = new ArrayList<>();predicates.add(context.getBuilder().equal(context.getRoot().get("project"), project));if (criteria != null)- predicates.add(criteria.getPredicate(context));+ predicates.add(criteria.getPredicate(project, context));return predicates.toArray(new Predicate[0]);}@@ -215,7 +215,7 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implements@Overridepublic int count(Milestone milestone, @Nullable StateSpec.Category category) {if (category != null) {- IssueCriteria criteria = milestone.getProject().getIssueWorkflow().getStatesCriteria(category);+ IssueCriteria criteria = milestone.getProject().getIssueWorkflow().getCategoryCriteria(category);if (criteria != null) {List<IssueCriteria> criterias = new ArrayList<>();criterias.add(new MilestoneCriteria(milestone.getName(), IssueQueryLexer.Is));diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultMilestoneManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultMilestoneManager.javaindex 48ba18c0b7..42b568a3c5 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultMilestoneManager.java+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultMilestoneManager.java@@ -42,12 +42,8 @@ public class DefaultMilestoneManager extends AbstractEntityManager<Milestone> im@Transactional@Overridepublic void delete(Milestone milestone, @Nullable Milestone moveIssuesToMilestone) {- Query<?> query = getSession().createQuery("update IssueBoard set milestone=null where milestone=:milestone");- query.setParameter("milestone", milestone);- query.executeUpdate();-if (moveIssuesToMilestone != null) {- query = getSession().createQuery("update Issue set milestone=:newMilestone where milestone=:milestone");+ Query<?> query = getSession().createQuery("update Issue set milestone=:newMilestone where milestone=:milestone");query.setParameter("milestone", milestone);query.setParameter("newMilestone", moveIssuesToMilestone);query.executeUpdate();@@ -55,7 +51,7 @@ public class DefaultMilestoneManager extends AbstractEntityManager<Milestone> immoveIssuesToMilestone.setNumOfOpenIssues(milestone.getNumOfOpenIssues()+moveIssuesToMilestone.getNumOfOpenIssues());save(moveIssuesToMilestone);} else {- query = getSession().createQuery("update Issue set milestone=null where milestone=:milestone");+ Query<?> query = getSession().createQuery("update Issue set milestone=null where milestone=:milestone");query.setParameter("milestone", milestone);query.executeUpdate();}diff --git a/core/src/main/java/io/onedev/server/model/Project.java b/core/src/main/java/io/onedev/server/model/Project.javaindex 3db8cc581a..a22cb91ae6 100644--- a/core/src/main/java/io/onedev/server/model/Project.java+++ b/core/src/main/java/io/onedev/server/model/Project.java@@ -223,13 +223,14 @@ public class Project extends AbstractEntity {issueListFields.add(Issue.VOTES);savedIssueQueries.add(new NamedQuery("All", "all"));- savedIssueQueries.add(new NamedQuery("Open", "\"State\" is \"Open\""));- savedIssueQueries.add(new NamedQuery("Closed", "\"State\" is \"Closed\""));+ savedIssueQueries.add(new NamedQuery("Open", "open"));+ savedIssueQueries.add(new NamedQuery("My open", "open and mine"));+ savedIssueQueries.add(new NamedQuery("Closed", "closed"));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\""));+ savedIssueQueries.add(new NamedQuery("High Priority", "\"Priority\" is \"High\""));}@Editable(order=100)diff --git a/core/src/main/java/io/onedev/server/model/support/issue/IssueBoard.java b/core/src/main/java/io/onedev/server/model/support/issue/IssueBoard.javaindex 7d4ec16f92..b6df36cb6f 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/IssueBoard.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/IssueBoard.java@@ -40,7 +40,9 @@ public class IssueBoard implements Serializable {private String name;- private String issueFilter;+ private String baseQuery;++ private String backlogBaseQuery = "open";private String identifyField;@@ -56,15 +58,26 @@ public class IssueBoard implements Serializable {this.name = name;}- @Editable(order=200, name="Issue Filter", description="Optionally specify a query to filter issues of the board")+ @Editable(order=200, description="Optionally specify a base query to filter/order issues of the board")+ @IssueQuery+ @Nullable+ public String getBaseQuery() {+ return baseQuery;+ }++ public void setBaseQuery(String baseQuery) {+ this.baseQuery = baseQuery;+ }++ @Editable(order=250, description="Optionally specify a base query to filter/order issues in backlog")@IssueQuery@Nullable- public String getIssueFilter() {- return issueFilter;+ public String getBacklogBaseQuery() {+ return backlogBaseQuery;}- public void setIssueFilter(String issueFilter) {- this.issueFilter = issueFilter;+ public void setBacklogBaseQuery(String backlogBaseQuery) {+ this.backlogBaseQuery = backlogBaseQuery;}@Editable(order=300, description="Specify issue field to identify different lists of the board")@@ -130,9 +143,9 @@ public class IssueBoard implements Serializable {public Set<String> getUndefinedStates(Project project) {Set<String> undefinedStates = new HashSet<>();- if (getIssueFilter() != null) {+ if (getBaseQuery() != null) {try {- undefinedStates.addAll(io.onedev.server.model.support.issue.query.IssueQuery.parse(project, getIssueFilter(), false).getUndefinedStates(project));+ undefinedStates.addAll(io.onedev.server.model.support.issue.query.IssueQuery.parse(project, getBaseQuery(), false).getUndefinedStates(project));} catch (Exception e) {}}@@ -146,13 +159,13 @@ public class IssueBoard implements Serializable {}public void fixUndefinedStates(Project project, Map<String, UndefinedStateResolution> resolutions) {- if (getIssueFilter() != null) {+ if (getBaseQuery() != null) {try {io.onedev.server.model.support.issue.query.IssueQuery query =- io.onedev.server.model.support.issue.query.IssueQuery.parse(project, getIssueFilter(), false);+ io.onedev.server.model.support.issue.query.IssueQuery.parse(project, getBaseQuery(), false);for (Map.Entry<String, UndefinedStateResolution> resolutionEntry: resolutions.entrySet())query.onRenameState(resolutionEntry.getKey(), resolutionEntry.getValue().getNewState());- setIssueFilter(query.toString());+ setBaseQuery(query.toString());} catch (Exception e) {}}@@ -167,9 +180,9 @@ public class IssueBoard implements Serializable {public Set<String> getUndefinedFields(Project project) {Set<String> undefinedFields = new HashSet<>();- if (getIssueFilter() != null) {+ if (getBaseQuery() != null) {try {- undefinedFields.addAll(io.onedev.server.model.support.issue.query.IssueQuery.parse(project, getIssueFilter(), false).getUndefinedFields(project));+ undefinedFields.addAll(io.onedev.server.model.support.issue.query.IssueQuery.parse(project, getBaseQuery(), false).getUndefinedFields(project));} catch (Exception e) {}}@@ -182,10 +195,10 @@ public class IssueBoard implements Serializable {}public boolean fixUndefinedFields(Project project, Map<String, UndefinedFieldResolution> resolutions) {- if (getIssueFilter() != null) {+ if (getBaseQuery() != null) {try {io.onedev.server.model.support.issue.query.IssueQuery query =- io.onedev.server.model.support.issue.query.IssueQuery.parse(project, getIssueFilter(), false);+ io.onedev.server.model.support.issue.query.IssueQuery.parse(project, getBaseQuery(), false);boolean remove = false;for (Map.Entry<String, UndefinedFieldResolution> entry: resolutions.entrySet()) {UndefinedFieldResolution resolution = entry.getValue();@@ -197,9 +210,9 @@ public class IssueBoard implements Serializable {}}if (remove)- setIssueFilter(null);+ setBaseQuery(null);else- setIssueFilter(query.toString());+ setBaseQuery(query.toString());} catch (Exception e) {}}@@ -244,9 +257,9 @@ public class IssueBoard implements Serializable {});try {- if (getIssueFilter() != null) {+ if (getBaseQuery() != null) {try {- undefinedFieldValues.addAll(io.onedev.server.model.support.issue.query.IssueQuery.parse(project, getIssueFilter(), true).getUndefinedFieldValues(project));+ undefinedFieldValues.addAll(io.onedev.server.model.support.issue.query.IssueQuery.parse(project, getBaseQuery(), true).getUndefinedFieldValues(project));} catch (Exception e) {}}@@ -267,10 +280,10 @@ public class IssueBoard implements Serializable {}public boolean fixUndefinedFieldValues(Project project, Map<UndefinedFieldValue, UndefinedFieldValueResolution> resolutions) {- if (getIssueFilter() != null) {+ if (getBaseQuery() != null) {try {io.onedev.server.model.support.issue.query.IssueQuery query =- io.onedev.server.model.support.issue.query.IssueQuery.parse(project, getIssueFilter(), true);+ io.onedev.server.model.support.issue.query.IssueQuery.parse(project, getBaseQuery(), true);boolean remove = false;for (Map.Entry<UndefinedFieldValue, UndefinedFieldValueResolution> entry: resolutions.entrySet()) {UndefinedFieldValueResolution resolution = entry.getValue();@@ -283,9 +296,9 @@ public class IssueBoard implements Serializable {}}if (remove)- setIssueFilter(null);+ setBaseQuery(null);else- setIssueFilter(query.toString());+ setBaseQuery(query.toString());} catch (Exception e) {}}diff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/AndCriteria.java b/core/src/main/java/io/onedev/server/model/support/issue/query/AndCriteria.javaindex 2a930b5975..e645ed283b 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/query/AndCriteria.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/query/AndCriteria.java@@ -25,10 +25,10 @@ public class AndCriteria extends IssueCriteria {}@Override- public Predicate getPredicate(QueryBuildContext context) {+ public Predicate getPredicate(Project project, QueryBuildContext context) {List<Predicate> predicates = new ArrayList<>();for (IssueCriteria criteria: criterias)- predicates.add(criteria.getPredicate(context));+ predicates.add(criteria.getPredicate(project, context));return context.getBuilder().and(predicates.toArray(new Predicate[0]));}diff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/BooleanFieldCriteria.java b/core/src/main/java/io/onedev/server/model/support/issue/query/BooleanFieldCriteria.javaindex f3fb91cf40..950a153deb 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/query/BooleanFieldCriteria.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/query/BooleanFieldCriteria.java@@ -9,6 +9,7 @@ import javax.persistence.criteria.Predicate;import io.onedev.server.model.Issue;import io.onedev.server.model.IssueFieldUnary;+import io.onedev.server.model.Project;public class BooleanFieldCriteria extends FieldCriteria {@@ -25,7 +26,7 @@ public class BooleanFieldCriteria extends FieldCriteria {}@Override- public Predicate getPredicate(QueryBuildContext context) {+ public Predicate getPredicate(Project project, QueryBuildContext context) {Path<String> attribute = context.getJoin(getFieldName()).get(IssueFieldUnary.VALUE);if (operator == IssueQueryLexer.Is)return context.getBuilder().equal(attribute, String.valueOf(value));@@ -48,7 +49,7 @@ public class BooleanFieldCriteria extends FieldCriteria {@Overridepublic String toString() {- return IssueQuery.quote(getFieldName()) + " " + IssueQuery.getOperatorName(operator) + " " + IssueQuery.quote(String.valueOf(value));+ return IssueQuery.quote(getFieldName()) + " " + IssueQuery.getRuleName(operator) + " " + IssueQuery.quote(String.valueOf(value));}@Overridediff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/ChoiceFieldCriteria.java b/core/src/main/java/io/onedev/server/model/support/issue/query/ChoiceFieldCriteria.javaindex 134f64deb5..a98527039a 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/query/ChoiceFieldCriteria.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/query/ChoiceFieldCriteria.java@@ -38,7 +38,7 @@ public class ChoiceFieldCriteria extends FieldCriteria {}@Override- public Predicate getPredicate(QueryBuildContext context) {+ public Predicate getPredicate(Project project, QueryBuildContext context) {Join<Issue, ?> join = context.getJoin(getFieldName());if (allowMultiple) {if (operator == IssueQueryLexer.Contains)@@ -86,7 +86,7 @@ public class ChoiceFieldCriteria extends FieldCriteria {@Overridepublic String toString() {- return IssueQuery.quote(getFieldName()) + " " + IssueQuery.getOperatorName(operator) + " " + IssueQuery.quote(value);+ return IssueQuery.quote(getFieldName()) + " " + IssueQuery.getRuleName(operator) + " " + IssueQuery.quote(value);}@Overridediff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/ClosedCriteria.java b/core/src/main/java/io/onedev/server/model/support/issue/query/ClosedCriteria.javanew file mode 100644index 0000000000..8608aa7ba6--- /dev/null+++ b/core/src/main/java/io/onedev/server/model/support/issue/query/ClosedCriteria.java@@ -0,0 +1,37 @@+package io.onedev.server.model.support.issue.query;++import javax.persistence.criteria.Predicate;++import io.onedev.server.model.Issue;+import io.onedev.server.model.Project;+import io.onedev.server.model.support.issue.workflow.StateSpec;++public class ClosedCriteria extends IssueCriteria {++ private static final long serialVersionUID = 1L;++ private IssueCriteria getCriteria(Project project) {+ return project.getIssueWorkflow().getCategoryCriteria(StateSpec.Category.CLOSED);+ }++ @Override+ public Predicate getPredicate(Project project, QueryBuildContext context) {+ return getCriteria(project).getPredicate(project, context);+ }++ @Override+ public boolean matches(Issue issue) {+ return getCriteria(issue.getProject()).matches(issue);+ }++ @Override+ public boolean needsLogin() {+ return false;+ }++ @Override+ public String toString() {+ return IssueQuery.getRuleName(IssueQueryLexer.Closed);+ }++}diff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/CommentsCriteria.java b/core/src/main/java/io/onedev/server/model/support/issue/query/CommentsCriteria.javaindex 1303351816..b526b218ee 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/query/CommentsCriteria.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/query/CommentsCriteria.java@@ -4,6 +4,7 @@ import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import io.onedev.server.model.Issue;+import io.onedev.server.model.Project;public class CommentsCriteria extends IssueCriteria {@@ -19,7 +20,7 @@ public class CommentsCriteria extends IssueCriteria {}@Override- public Predicate getPredicate(QueryBuildContext context) {+ public Predicate getPredicate(Project project, QueryBuildContext context) {Path<Integer> attribute = context.getRoot().get(Issue.BUILTIN_FIELDS.get(Issue.COMMENTS));if (operator == IssueQueryLexer.Is)return context.getBuilder().equal(attribute, value);@@ -50,7 +51,7 @@ public class CommentsCriteria extends IssueCriteria {@Overridepublic String toString() {- return IssueQuery.quote(Issue.COMMENTS) + " " + IssueQuery.getOperatorName(operator) + " " + IssueQuery.quote(String.valueOf(value));+ return IssueQuery.quote(Issue.COMMENTS) + " " + IssueQuery.getRuleName(operator) + " " + IssueQuery.quote(String.valueOf(value));}}diff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/DateFieldCriteria.java b/core/src/main/java/io/onedev/server/model/support/issue/query/DateFieldCriteria.javaindex 1f17d9619f..64b4d3f699 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/query/DateFieldCriteria.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/query/DateFieldCriteria.java@@ -7,6 +7,7 @@ import javax.persistence.criteria.Predicate;import io.onedev.server.model.Issue;import io.onedev.server.model.IssueFieldUnary;+import io.onedev.server.model.Project;public class DateFieldCriteria extends FieldCriteria {@@ -26,7 +27,7 @@ public class DateFieldCriteria extends FieldCriteria {}@Override- public Predicate getPredicate(QueryBuildContext context) {+ public Predicate getPredicate(Project project, QueryBuildContext context) {Join<Issue, ?> join = context.getJoin(getFieldName());if (operator == IssueQueryLexer.IsBefore)return context.getBuilder().lessThan(join.get(IssueFieldUnary.ORDINAL), value.getTime());@@ -50,7 +51,7 @@ public class DateFieldCriteria extends FieldCriteria {@Overridepublic String toString() {- return IssueQuery.quote(getFieldName()) + " " + IssueQuery.getOperatorName(operator) + " " + IssueQuery.quote(rawValue);+ return IssueQuery.quote(getFieldName()) + " " + IssueQuery.getRuleName(operator) + " " + IssueQuery.quote(rawValue);}}diff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/DescriptionCriteria.java b/core/src/main/java/io/onedev/server/model/support/issue/query/DescriptionCriteria.javaindex 676fb3855e..142504a078 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/query/DescriptionCriteria.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/query/DescriptionCriteria.java@@ -4,6 +4,7 @@ import javax.persistence.criteria.Expression;import javax.persistence.criteria.Predicate;import io.onedev.server.model.Issue;+import io.onedev.server.model.Project;public class DescriptionCriteria extends IssueCriteria {@@ -19,7 +20,7 @@ public class DescriptionCriteria extends IssueCriteria {}@Override- public Predicate getPredicate(QueryBuildContext context) {+ public Predicate getPredicate(Project project, QueryBuildContext context) {Expression<String> attribute = context.getRoot().get(Issue.BUILTIN_FIELDS.get(Issue.DESCRIPTION));if (operator == IssueQueryLexer.Contains)return context.getBuilder().like(attribute, "%" + value + "%");@@ -42,7 +43,7 @@ public class DescriptionCriteria extends IssueCriteria {@Overridepublic String toString() {- return IssueQuery.quote(Issue.DESCRIPTION) + " " + IssueQuery.getOperatorName(operator) + " " + IssueQuery.quote(value);+ return IssueQuery.quote(Issue.DESCRIPTION) + " " + IssueQuery.getRuleName(operator) + " " + IssueQuery.quote(value);}}diff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/DescriptionUnaryCriteria.java b/core/src/main/java/io/onedev/server/model/support/issue/query/DescriptionUnaryCriteria.javaindex 7bd4c9772d..177d80cec8 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/query/DescriptionUnaryCriteria.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/query/DescriptionUnaryCriteria.java@@ -4,6 +4,7 @@ import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import io.onedev.server.model.Issue;+import io.onedev.server.model.Project;public class DescriptionUnaryCriteria extends IssueCriteria {@@ -16,7 +17,7 @@ public class DescriptionUnaryCriteria extends IssueCriteria {}@Override- public Predicate getPredicate(QueryBuildContext context) {+ public Predicate getPredicate(Project project, QueryBuildContext context) {Path<?> attribute = context.getRoot().get(Issue.BUILTIN_FIELDS.get(Issue.DESCRIPTION));if (operator == IssueQueryLexer.IsEmpty)return context.getBuilder().isNull(attribute);@@ -39,7 +40,7 @@ public class DescriptionUnaryCriteria extends IssueCriteria {@Overridepublic String toString() {- return IssueQuery.quote(Issue.DESCRIPTION) + " " + IssueQuery.getOperatorName(operator);+ return IssueQuery.quote(Issue.DESCRIPTION) + " " + IssueQuery.getRuleName(operator);}}diff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/FieldUnaryCriteria.java b/core/src/main/java/io/onedev/server/model/support/issue/query/FieldUnaryCriteria.javaindex 27ad0ec43d..40fe862812 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/query/FieldUnaryCriteria.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/query/FieldUnaryCriteria.java@@ -9,6 +9,7 @@ import javax.persistence.criteria.Predicate;import io.onedev.server.model.Issue;import io.onedev.server.model.IssueFieldUnary;+import io.onedev.server.model.Project;import io.onedev.server.security.SecurityUtils;public class FieldUnaryCriteria extends FieldCriteria {@@ -23,7 +24,7 @@ public class FieldUnaryCriteria extends FieldCriteria {}@Override- public Predicate getPredicate(QueryBuildContext context) {+ public Predicate getPredicate(Project project, QueryBuildContext context) {Path<?> attribute = context.getJoin(getFieldName()).get(IssueFieldUnary.VALUE);if (operator == IssueQueryLexer.IsEmpty)return context.getBuilder().isNull(attribute);@@ -55,7 +56,7 @@ public class FieldUnaryCriteria extends FieldCriteria {@Overridepublic String toString() {- return IssueQuery.quote(getFieldName()) + " " + IssueQuery.getOperatorName(operator);+ return IssueQuery.quote(getFieldName()) + " " + IssueQuery.getRuleName(operator);}@Overridediff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/IssueCriteria.java b/core/src/main/java/io/onedev/server/model/support/issue/query/IssueCriteria.javaindex 4758c59923..fa3072a2b8 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/query/IssueCriteria.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/query/IssueCriteria.java@@ -3,8 +3,10 @@ package io.onedev.server.model.support.issue.query;import java.io.Serializable;import java.util.Collection;import java.util.HashSet;+import java.util.List;import java.util.Set;+import javax.annotation.Nullable;import javax.persistence.criteria.Predicate;import io.onedev.server.model.Issue;@@ -15,7 +17,7 @@ public abstract class IssueCriteria implements Serializable {private static final long serialVersionUID = 1L;- public abstract Predicate getPredicate(QueryBuildContext context);+ public abstract Predicate getPredicate(Project project, QueryBuildContext context);public final void populate(Issue issue, Serializable fieldBean) {populate(issue, fieldBean, new HashSet<>());@@ -59,4 +61,13 @@ public abstract class IssueCriteria implements Serializable {return false;}+ @Nullable+ public static IssueCriteria of(List<IssueCriteria> criterias) {+ if (criterias.size() > 1)+ return new AndCriteria(criterias);+ else if (criterias.size() == 1)+ return criterias.iterator().next();+ else+ return null;+ }}diff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/IssueFieldCriteria.java b/core/src/main/java/io/onedev/server/model/support/issue/query/IssueFieldCriteria.javaindex b1aafeb4f6..158f8fe01b 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/query/IssueFieldCriteria.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/query/IssueFieldCriteria.java@@ -7,6 +7,7 @@ import javax.persistence.criteria.Predicate;import io.onedev.server.model.Issue;import io.onedev.server.model.IssueFieldUnary;+import io.onedev.server.model.Project;public class IssueFieldCriteria extends FieldCriteria {@@ -23,7 +24,7 @@ public class IssueFieldCriteria extends FieldCriteria {}@Override- public Predicate getPredicate(QueryBuildContext context) {+ public Predicate getPredicate(Project project, QueryBuildContext context) {Path<Long> attribute = context.getJoin(getFieldName()).get(IssueFieldUnary.ORDINAL);if (operator == IssueQueryLexer.Is)return context.getBuilder().equal(attribute, value);@@ -47,7 +48,7 @@ public class IssueFieldCriteria extends FieldCriteria {@Overridepublic String toString() {- return IssueQuery.quote(getFieldName()) + " " + IssueQuery.getOperatorName(operator) + " " + IssueQuery.quote(String.valueOf(value));+ return IssueQuery.quote(getFieldName()) + " " + IssueQuery.getRuleName(operator) + " " + IssueQuery.quote(String.valueOf(value));}}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.g4index ae301a29cc..df2a679013 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@@ -9,6 +9,8 @@ querycriteria: Mine #MineCriteria+ | Open #OpenCriteria+ | Closed #ClosedCriteria| 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@@ -28,6 +30,14 @@ All: 'all';+Open+ : 'open'+ ;++Closed+ : 'closed'+ ;+OrderBy: 'order' WS+ 'by';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.javaindex 2a1544d36f..cb8a965869 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@@ -19,8 +19,6 @@ import org.antlr.v4.runtime.BaseErrorListener;import org.antlr.v4.runtime.CommonTokenStream;import org.antlr.v4.runtime.RecognitionException;import org.antlr.v4.runtime.Recognizer;-import org.slf4j.Logger;-import org.slf4j.LoggerFactory;import org.unbescape.java.JavaEscape;import com.google.common.base.Splitter;@@ -33,15 +31,16 @@ import io.onedev.server.model.Project;import io.onedev.server.model.User;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.ClosedCriteriaContext;import io.onedev.server.model.support.issue.query.IssueQueryParser.CriteriaContext;import io.onedev.server.model.support.issue.query.IssueQueryParser.MineCriteriaContext;+import io.onedev.server.model.support.issue.query.IssueQueryParser.OpenCriteriaContext;import io.onedev.server.model.support.issue.query.IssueQueryParser.OrCriteriaContext;import io.onedev.server.model.support.issue.query.IssueQueryParser.OrderContext;import io.onedev.server.model.support.issue.query.IssueQueryParser.QueryContext;import io.onedev.server.model.support.issue.query.IssueQueryParser.UnaryCriteriaContext;import io.onedev.server.model.support.issue.query.IssueQueryParser.ValueCriteriaContext;import io.onedev.server.model.support.issue.query.IssueSort.Direction;-import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.DateUtils;import io.onedev.server.util.EditContext;import io.onedev.server.util.OneContext;@@ -62,8 +61,6 @@ public class IssueQuery implements Serializable {private static final long serialVersionUID = 1L;- private static final Logger logger = LoggerFactory.getLogger(IssueQuery.class);-private final IssueCriteria criteria;private final List<IssueSort> sorts;@@ -118,12 +115,7 @@ public class IssueQuery implements Serializable {@Overridepublic void syntaxError(Recognizer<?, ?> recognizer, Object offendingSymbol, int line,int charPositionInLine, String msg, RecognitionException e) {- if (e != null) {- logger.error("Error lexing issue query", e);- } else if (msg != null) {- logger.error("Error lexing issue query: " + msg);- }- throw new RuntimeException("Malformed issue query");+ throw new OneException("Malformed query syntax", e);}});@@ -131,7 +123,15 @@ public class IssueQuery implements Serializable {IssueQueryParser parser = new IssueQueryParser(tokens);parser.removeErrorListeners();parser.setErrorHandler(new BailErrorStrategy());- QueryContext queryContext = parser.query();+ QueryContext queryContext;+ try {+ queryContext = parser.query();+ } catch (Exception e) {+ if (e instanceof OneException)+ throw e;+ else+ throw new OneException("Malformed query syntax", e);+ }CriteriaContext criteriaContext = queryContext.criteria();IssueCriteria issueCriteria;if (criteriaContext != null) {@@ -173,22 +173,19 @@ public class IssueQuery implements Serializable {@Overridepublic IssueCriteria visitMineCriteria(MineCriteriaContext ctx) {- IssueCriteria submitterCriteria = new SubmitterCriteria(SecurityUtils.getUser(), IssueQueryLexer.Is);- List<IssueCriteria> fieldCriterias = new ArrayList<>();- for (InputSpec field: project.getIssueWorkflow().getFieldSpecs()) {- if (field instanceof UserChoiceInput) {- IssueCriteria fieldCriteria = new FieldUnaryCriteria(field.getName(), IssueQueryLexer.IsMe);- fieldCriterias.add(fieldCriteria);- }- }- if (!fieldCriterias.isEmpty()) {- fieldCriterias.add(0, submitterCriteria);- return new OrCriteria(fieldCriterias);- } else {- return submitterCriteria;- }+ return new MineCriteria();}+ @Override+ public IssueCriteria visitOpenCriteria(OpenCriteriaContext ctx) {+ return new OpenCriteria();+ }++ @Override+ public IssueCriteria visitClosedCriteria(ClosedCriteriaContext ctx) {+ return new ClosedCriteria();+ }+@Overridepublic IssueCriteria visitUnaryCriteria(UnaryCriteriaContext ctx) {String fieldName = getValue(ctx.Quoted().getText());@@ -309,7 +306,7 @@ public class IssueQuery implements Serializable {}}default:- throw new OneException("Unexpected operator " + getOperatorName(operator));+ throw new OneException("Unexpected operator " + getRuleName(operator));}}@@ -366,7 +363,7 @@ public class IssueQuery implements Serializable {}private static OneException newOperatorException(String fieldName, int operator) {- return new OneException("Field '" + fieldName + "' is not applicable for operator '" + getOperatorName(operator) + "'");+ return new OneException("Field '" + fieldName + "' is not applicable for operator '" + getRuleName(operator) + "'");}public static void checkField(Project project, String fieldName, int operator) {@@ -438,8 +435,8 @@ public class IssueQuery implements Serializable {return criteria == null || criteria.matches(issue);}- public static String getOperatorName(int operator) {- return WordUtils.uncamel(IssueQueryLexer.ruleNames[operator-1]).toLowerCase();+ public static String getRuleName(int rule) {+ return WordUtils.uncamel(IssueQueryLexer.ruleNames[rule-1]).toLowerCase();}public static int getOperator(String operatorName) {@@ -542,4 +539,16 @@ public class IssueQuery implements Serializable {}}+ public static IssueQuery merge(IssueQuery query1, IssueQuery query2) {+ List<IssueCriteria> criterias = new ArrayList<>();+ if (query1.getCriteria() != null)+ criterias.add(query1.getCriteria());+ if (query2.getCriteria() != null)+ criterias.add(query2.getCriteria());+ List<IssueSort> sorts = new ArrayList<>();+ sorts.addAll(query1.getSorts());+ sorts.addAll(query2.getSorts());+ return new IssueQuery(IssueCriteria.of(criterias), sorts);+ }+}diff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/MilestoneCriteria.java b/core/src/main/java/io/onedev/server/model/support/issue/query/MilestoneCriteria.javaindex 30a670713b..0597273330 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/query/MilestoneCriteria.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/query/MilestoneCriteria.java@@ -8,6 +8,7 @@ import javax.persistence.criteria.Predicate;import io.onedev.server.model.Issue;import io.onedev.server.model.Milestone;+import io.onedev.server.model.Project;public class MilestoneCriteria extends IssueCriteria {@@ -31,7 +32,7 @@ public class MilestoneCriteria extends IssueCriteria {}@Override- public Predicate getPredicate(QueryBuildContext context) {+ public Predicate getPredicate(Project project, QueryBuildContext context) {Path<?> attribute = context.getJoin(Issue.MILESTONE).get(Milestone.NAME);if (operator == IssueQueryLexer.Is)return context.getBuilder().equal(attribute, value);@@ -54,7 +55,7 @@ public class MilestoneCriteria extends IssueCriteria {@Overridepublic String toString() {- return IssueQuery.quote(Issue.MILESTONE) + " " + IssueQuery.getOperatorName(operator) + " " + IssueQuery.quote(value);+ return IssueQuery.quote(Issue.MILESTONE) + " " + IssueQuery.getRuleName(operator) + " " + IssueQuery.quote(value);}@Overridediff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/MilestoneUnaryCriteria.java b/core/src/main/java/io/onedev/server/model/support/issue/query/MilestoneUnaryCriteria.javaindex 3f80e548cb..e83d05355b 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/query/MilestoneUnaryCriteria.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/query/MilestoneUnaryCriteria.java@@ -5,6 +5,7 @@ import javax.persistence.criteria.Predicate;import io.onedev.server.model.Issue;import io.onedev.server.model.Milestone;+import io.onedev.server.model.Project;public class MilestoneUnaryCriteria extends IssueCriteria {@@ -17,7 +18,7 @@ public class MilestoneUnaryCriteria extends IssueCriteria {}@Override- public Predicate getPredicate(QueryBuildContext context) {+ public Predicate getPredicate(Project project, QueryBuildContext context) {Path<?> attribute = context.getJoin(Issue.MILESTONE).get(Milestone.NAME);if (operator == IssueQueryLexer.IsEmpty)return context.getBuilder().isNull(attribute);@@ -40,7 +41,7 @@ public class MilestoneUnaryCriteria extends IssueCriteria {@Overridepublic String toString() {- return IssueQuery.quote(Issue.MILESTONE) + " " + IssueQuery.getOperatorName(operator);+ return IssueQuery.quote(Issue.MILESTONE) + " " + IssueQuery.getRuleName(operator);}}diff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/MineCriteria.java b/core/src/main/java/io/onedev/server/model/support/issue/query/MineCriteria.javanew file mode 100644index 0000000000..6c41741e6c--- /dev/null+++ b/core/src/main/java/io/onedev/server/model/support/issue/query/MineCriteria.java@@ -0,0 +1,55 @@+package io.onedev.server.model.support.issue.query;++import java.util.ArrayList;+import java.util.List;++import javax.persistence.criteria.Predicate;++import io.onedev.server.model.Issue;+import io.onedev.server.model.Project;+import io.onedev.server.security.SecurityUtils;+import io.onedev.server.util.inputspec.InputSpec;+import io.onedev.server.util.inputspec.userchoiceinput.UserChoiceInput;++public class MineCriteria extends IssueCriteria {++ private static final long serialVersionUID = 1L;++ private IssueCriteria getCriteria(Project project) {+ IssueCriteria submitterCriteria = new SubmitterCriteria(SecurityUtils.getUser(), IssueQueryLexer.Is);+ List<IssueCriteria> fieldCriterias = new ArrayList<>();+ for (InputSpec field: project.getIssueWorkflow().getFieldSpecs()) {+ if (field instanceof UserChoiceInput) {+ IssueCriteria fieldCriteria = new FieldUnaryCriteria(field.getName(), IssueQueryLexer.IsMe);+ fieldCriterias.add(fieldCriteria);+ }+ }+ if (!fieldCriterias.isEmpty()) {+ fieldCriterias.add(0, submitterCriteria);+ return new OrCriteria(fieldCriterias);+ } else {+ return submitterCriteria;+ }+ }++ @Override+ public Predicate getPredicate(Project project, QueryBuildContext context) {+ return getCriteria(project).getPredicate(project, context);+ }++ @Override+ public boolean matches(Issue issue) {+ return getCriteria(issue.getProject()).matches(issue);+ }++ @Override+ public boolean needsLogin() {+ return true;+ }++ @Override+ public String toString() {+ return IssueQuery.getRuleName(IssueQueryLexer.Mine);+ }++}diff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/NumberCriteria.java b/core/src/main/java/io/onedev/server/model/support/issue/query/NumberCriteria.javaindex 2c0d24d89d..e54a4b9f0e 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/query/NumberCriteria.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/query/NumberCriteria.java@@ -4,6 +4,7 @@ import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import io.onedev.server.model.Issue;+import io.onedev.server.model.Project;public class NumberCriteria extends IssueCriteria {@@ -19,7 +20,7 @@ public class NumberCriteria extends IssueCriteria {}@Override- public Predicate getPredicate(QueryBuildContext context) {+ public Predicate getPredicate(Project project, QueryBuildContext context) {Path<Long> attribute = context.getRoot().get(Issue.BUILTIN_FIELDS.get(Issue.NUMBER));if (operator == IssueQueryLexer.Is)return context.getBuilder().equal(attribute, value);@@ -50,7 +51,7 @@ public class NumberCriteria extends IssueCriteria {@Overridepublic String toString() {- return IssueQuery.quote(Issue.NUMBER) + " " + IssueQuery.getOperatorName(operator) + " " + IssueQuery.quote(String.valueOf(value));+ return IssueQuery.quote(Issue.NUMBER) + " " + IssueQuery.getRuleName(operator) + " " + IssueQuery.quote(String.valueOf(value));}}diff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/NumberFieldCriteria.java b/core/src/main/java/io/onedev/server/model/support/issue/query/NumberFieldCriteria.javaindex d01ba1d8b6..1a170cc8ba 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/query/NumberFieldCriteria.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/query/NumberFieldCriteria.java@@ -9,6 +9,7 @@ import javax.persistence.criteria.Predicate;import io.onedev.server.model.Issue;import io.onedev.server.model.IssueFieldUnary;+import io.onedev.server.model.Project;public class NumberFieldCriteria extends FieldCriteria {@@ -25,7 +26,7 @@ public class NumberFieldCriteria extends FieldCriteria {}@Override- public Predicate getPredicate(QueryBuildContext context) {+ public Predicate getPredicate(Project project, QueryBuildContext context) {Path<Integer> attribute = context.getJoin(getFieldName()).get(IssueFieldUnary.ORDINAL);if (operator == IssueQueryLexer.Is)return context.getBuilder().equal(attribute, value);@@ -57,7 +58,7 @@ public class NumberFieldCriteria extends FieldCriteria {@Overridepublic String toString() {- return IssueQuery.quote(getFieldName()) + " " + IssueQuery.getOperatorName(operator) + " " + IssueQuery.quote(String.valueOf(value));+ return IssueQuery.quote(getFieldName()) + " " + IssueQuery.getRuleName(operator) + " " + IssueQuery.quote(String.valueOf(value));}@Overridediff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/OpenCriteria.java b/core/src/main/java/io/onedev/server/model/support/issue/query/OpenCriteria.javanew file mode 100644index 0000000000..59f98b4ff3--- /dev/null+++ b/core/src/main/java/io/onedev/server/model/support/issue/query/OpenCriteria.java@@ -0,0 +1,37 @@+package io.onedev.server.model.support.issue.query;++import javax.persistence.criteria.Predicate;++import io.onedev.server.model.Issue;+import io.onedev.server.model.Project;+import io.onedev.server.model.support.issue.workflow.StateSpec;++public class OpenCriteria extends IssueCriteria {++ private static final long serialVersionUID = 1L;++ private IssueCriteria getCriteria(Project project) {+ return project.getIssueWorkflow().getCategoryCriteria(StateSpec.Category.OPEN);+ }++ @Override+ public Predicate getPredicate(Project project, QueryBuildContext context) {+ return getCriteria(project).getPredicate(project, context);+ }++ @Override+ public boolean matches(Issue issue) {+ return getCriteria(issue.getProject()).matches(issue);+ }++ @Override+ public boolean needsLogin() {+ return false;+ }++ @Override+ public String toString() {+ return IssueQuery.getRuleName(IssueQueryLexer.Open);+ }++}diff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/OrCriteria.java b/core/src/main/java/io/onedev/server/model/support/issue/query/OrCriteria.javaindex 50f2660371..c5f40a3fcb 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/query/OrCriteria.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/query/OrCriteria.java@@ -24,10 +24,10 @@ public class OrCriteria extends IssueCriteria {}@Override- public Predicate getPredicate(QueryBuildContext context) {+ public Predicate getPredicate(Project project, QueryBuildContext context) {List<Predicate> predicates = new ArrayList<>();for (IssueCriteria criteria: criterias)- predicates.add(criteria.getPredicate(context));+ predicates.add(criteria.getPredicate(project, context));return context.getBuilder().or(predicates.toArray(new Predicate[0]));}diff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/StateCriteria.java b/core/src/main/java/io/onedev/server/model/support/issue/query/StateCriteria.javaindex 3bb75aeb08..3673c5a46f 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/query/StateCriteria.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/query/StateCriteria.java@@ -26,7 +26,7 @@ public class StateCriteria extends IssueCriteria {}@Override- public Predicate getPredicate(QueryBuildContext context) {+ public Predicate getPredicate(Project project, QueryBuildContext context) {Path<?> attribute = context.getRoot().get(Issue.BUILTIN_FIELDS.get(Issue.STATE));if (operator == IssueQueryLexer.Is)return context.getBuilder().equal(attribute, value);@@ -55,7 +55,7 @@ public class StateCriteria extends IssueCriteria {@Overridepublic String toString() {- return IssueQuery.quote(Issue.STATE) + " " + IssueQuery.getOperatorName(operator) + " " + IssueQuery.quote(value);+ return IssueQuery.quote(Issue.STATE) + " " + IssueQuery.getRuleName(operator) + " " + IssueQuery.quote(value);}@Overridediff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/StringFieldCriteria.java b/core/src/main/java/io/onedev/server/model/support/issue/query/StringFieldCriteria.javaindex 67078643ea..d2708fa7eb 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/query/StringFieldCriteria.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/query/StringFieldCriteria.java@@ -9,6 +9,7 @@ import javax.persistence.criteria.Predicate;import io.onedev.server.model.Issue;import io.onedev.server.model.IssueFieldUnary;+import io.onedev.server.model.Project;public class StringFieldCriteria extends FieldCriteria {@@ -29,7 +30,7 @@ public class StringFieldCriteria extends FieldCriteria {}@Override- public Predicate getPredicate(QueryBuildContext context) {+ public Predicate getPredicate(Project project, QueryBuildContext context) {Path<String> attribute = context.getJoin(getFieldName()).get(IssueFieldUnary.VALUE);if (operator == IssueQueryLexer.Is)return context.getBuilder().equal(attribute, value);@@ -61,7 +62,7 @@ public class StringFieldCriteria extends FieldCriteria {@Overridepublic String toString() {- return IssueQuery.quote(getFieldName()) + " " + IssueQuery.getOperatorName(operator) + " " + IssueQuery.quote(value);+ return IssueQuery.quote(getFieldName()) + " " + IssueQuery.getRuleName(operator) + " " + IssueQuery.quote(value);}@Overridediff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/SubmitDateCriteria.java b/core/src/main/java/io/onedev/server/model/support/issue/query/SubmitDateCriteria.javaindex 537c35a535..bd5f902837 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/query/SubmitDateCriteria.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/query/SubmitDateCriteria.java@@ -6,6 +6,7 @@ import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import io.onedev.server.model.Issue;+import io.onedev.server.model.Project;public class SubmitDateCriteria extends IssueCriteria {@@ -24,7 +25,7 @@ public class SubmitDateCriteria extends IssueCriteria {}@Override- public Predicate getPredicate(QueryBuildContext context) {+ public Predicate getPredicate(Project project, QueryBuildContext context) {Path<Long> attribute = context.getRoot().get(Issue.BUILTIN_FIELDS.get(Issue.SUBMIT_DATE));if (operator == IssueQueryLexer.IsBefore)return context.getBuilder().lessThan(attribute, value.getTime());@@ -47,7 +48,7 @@ public class SubmitDateCriteria extends IssueCriteria {@Overridepublic String toString() {- return IssueQuery.quote(Issue.SUBMIT_DATE) + " " + IssueQuery.getOperatorName(operator) + " " + IssueQuery.quote(rawValue);+ return IssueQuery.quote(Issue.SUBMIT_DATE) + " " + IssueQuery.getRuleName(operator) + " " + IssueQuery.quote(rawValue);}}diff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/SubmitterCriteria.java b/core/src/main/java/io/onedev/server/model/support/issue/query/SubmitterCriteria.javaindex 77d9196fb9..c0602ac821 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/query/SubmitterCriteria.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/query/SubmitterCriteria.java@@ -6,6 +6,7 @@ import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import io.onedev.server.model.Issue;+import io.onedev.server.model.Project;import io.onedev.server.model.User;public class SubmitterCriteria extends IssueCriteria {@@ -22,7 +23,7 @@ public class SubmitterCriteria extends IssueCriteria {}@Override- public Predicate getPredicate(QueryBuildContext context) {+ public Predicate getPredicate(Project project, QueryBuildContext context) {Path<User> attribute = context.getRoot().get(Issue.BUILTIN_FIELDS.get(Issue.SUBMITTER));if (operator == IssueQueryLexer.Is)return context.getBuilder().equal(attribute, value);@@ -45,7 +46,7 @@ public class SubmitterCriteria extends IssueCriteria {@Overridepublic String toString() {- return IssueQuery.quote(Issue.SUBMITTER) + " " + IssueQuery.getOperatorName(operator) + " " + IssueQuery.quote(value.getName());+ return IssueQuery.quote(Issue.SUBMITTER) + " " + IssueQuery.getRuleName(operator) + " " + IssueQuery.quote(value.getName());}}diff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/SubmitterUnaryCriteria.java b/core/src/main/java/io/onedev/server/model/support/issue/query/SubmitterUnaryCriteria.javaindex 320633ee23..6cbec4cd2e 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/query/SubmitterUnaryCriteria.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/query/SubmitterUnaryCriteria.java@@ -6,6 +6,7 @@ import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import io.onedev.server.model.Issue;+import io.onedev.server.model.Project;import io.onedev.server.security.SecurityUtils;public class SubmitterUnaryCriteria extends IssueCriteria {@@ -19,7 +20,7 @@ public class SubmitterUnaryCriteria extends IssueCriteria {}@Override- public Predicate getPredicate(QueryBuildContext context) {+ public Predicate getPredicate(Project project, QueryBuildContext context) {Path<?> attribute = context.getRoot().get(Issue.BUILTIN_FIELDS.get(Issue.SUBMITTER));if (operator == IssueQueryLexer.IsMe)return context.getBuilder().equal(attribute, SecurityUtils.getUser());@@ -42,7 +43,7 @@ public class SubmitterUnaryCriteria extends IssueCriteria {@Overridepublic String toString() {- return IssueQuery.quote(Issue.SUBMITTER) + " " + IssueQuery.getOperatorName(operator);+ return IssueQuery.quote(Issue.SUBMITTER) + " " + IssueQuery.getRuleName(operator);}}diff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/TitleCriteria.java b/core/src/main/java/io/onedev/server/model/support/issue/query/TitleCriteria.javaindex 7f9e76d9f0..c70cbaa73f 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/query/TitleCriteria.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/query/TitleCriteria.java@@ -4,6 +4,7 @@ import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import io.onedev.server.model.Issue;+import io.onedev.server.model.Project;public class TitleCriteria extends IssueCriteria {@@ -19,7 +20,7 @@ public class TitleCriteria extends IssueCriteria {}@Override- public Predicate getPredicate(QueryBuildContext context) {+ public Predicate getPredicate(Project project, QueryBuildContext context) {Path<String> attribute = context.getRoot().get(Issue.BUILTIN_FIELDS.get(Issue.TITLE));if (operator == IssueQueryLexer.Contains)return context.getBuilder().like(attribute, "%" + value + "%");@@ -42,7 +43,7 @@ public class TitleCriteria extends IssueCriteria {@Overridepublic String toString() {- return IssueQuery.quote(Issue.TITLE) + " " + IssueQuery.getOperatorName(operator) + " " + IssueQuery.quote(value);+ return IssueQuery.quote(Issue.TITLE) + " " + IssueQuery.getRuleName(operator) + " " + IssueQuery.quote(value);}}diff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/UpdateDateCriteria.java b/core/src/main/java/io/onedev/server/model/support/issue/query/UpdateDateCriteria.javaindex f7fa7c4b52..19e6c18d26 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/query/UpdateDateCriteria.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/query/UpdateDateCriteria.java@@ -6,6 +6,7 @@ import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import io.onedev.server.model.Issue;+import io.onedev.server.model.Project;public class UpdateDateCriteria extends IssueCriteria {@@ -24,7 +25,7 @@ public class UpdateDateCriteria extends IssueCriteria {}@Override- public Predicate getPredicate(QueryBuildContext context) {+ public Predicate getPredicate(Project project, QueryBuildContext context) {Path<Long> attribute = IssueQuery.getPath(context.getRoot(), Issue.BUILTIN_FIELDS.get(Issue.UPDATE_DATE));if (operator == IssueQueryLexer.IsBefore)return context.getBuilder().lessThan(attribute, value.getTime());@@ -47,7 +48,7 @@ public class UpdateDateCriteria extends IssueCriteria {@Overridepublic String toString() {- return IssueQuery.quote(Issue.UPDATE_DATE) + " " + IssueQuery.getOperatorName(operator) + " " + IssueQuery.quote(rawValue);+ return IssueQuery.quote(Issue.UPDATE_DATE) + " " + IssueQuery.getRuleName(operator) + " " + IssueQuery.quote(rawValue);}}diff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/VotesCriteria.java b/core/src/main/java/io/onedev/server/model/support/issue/query/VotesCriteria.javaindex 01e7907fef..97cff214da 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/query/VotesCriteria.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/query/VotesCriteria.java@@ -4,6 +4,7 @@ import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import io.onedev.server.model.Issue;+import io.onedev.server.model.Project;public class VotesCriteria extends IssueCriteria {@@ -19,7 +20,7 @@ public class VotesCriteria extends IssueCriteria {}@Override- public Predicate getPredicate(QueryBuildContext context) {+ public Predicate getPredicate(Project project, QueryBuildContext context) {Path<Integer> attribute = context.getRoot().get(Issue.BUILTIN_FIELDS.get(Issue.VOTES));if (operator == IssueQueryLexer.Is)return context.getBuilder().equal(attribute, value);@@ -50,7 +51,7 @@ public class VotesCriteria extends IssueCriteria {@Overridepublic String toString() {- return IssueQuery.quote(Issue.VOTES) + " " + IssueQuery.getOperatorName(operator) + " " + IssueQuery.quote(String.valueOf(value));+ return IssueQuery.quote(Issue.VOTES) + " " + IssueQuery.getRuleName(operator) + " " + IssueQuery.quote(String.valueOf(value));}}diff --git a/core/src/main/java/io/onedev/server/model/support/issue/workflow/IssueWorkflow.java b/core/src/main/java/io/onedev/server/model/support/issue/workflow/IssueWorkflow.javaindex ca7ac9de53..769b98e0a0 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/workflow/IssueWorkflow.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/workflow/IssueWorkflow.java@@ -394,19 +394,13 @@ public class IssueWorkflow implements Serializable {return applicableFields;}- @Nullable- public IssueCriteria getStatesCriteria(StateSpec.Category category) {+ public IssueCriteria getCategoryCriteria(StateSpec.Category category) {List<IssueCriteria> criterias = new ArrayList<>();for (StateSpec state: getStateSpecs()) {if (category == state.getCategory())criterias.add(new StateCriteria(state.getName(), IssueQueryLexer.Is));}- if (criterias.size() > 1)- return new OrCriteria(criterias);- else if (criterias.size() == 1)- return criterias.iterator().next();- else- return null;+ return new OrCriteria(criterias);}}diff --git a/core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java b/core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.javaindex ee6c0ae9a0..c0418f81ad 100644--- a/core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java+++ b/core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java@@ -242,6 +242,11 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {if ((suggestedLiteral.equals("is me") || suggestedLiteral.equals("is not me")) && SecurityUtils.getUser() == null)return null;+ if (suggestedLiteral.equals("open"))+ return Optional.of("issues with state in open category");+ else if (suggestedLiteral.equals("closed"))+ return Optional.of("issues with state in closed category");+if (expectedElement.getParent() != null&& expectedElement.getParent().getParent() != null&& expectedElement.getParent().getParent().getSpec() instanceof RuleRefElementSpec) {diff --git a/core/src/main/java/io/onedev/server/web/behavior/infinitescroll/InfiniteScrollBehavior.java b/core/src/main/java/io/onedev/server/web/behavior/infinitescroll/InfiniteScrollBehavior.javaindex 8d6f73d096..703932b2d3 100644--- a/core/src/main/java/io/onedev/server/web/behavior/infinitescroll/InfiniteScrollBehavior.java+++ b/core/src/main/java/io/onedev/server/web/behavior/infinitescroll/InfiniteScrollBehavior.java@@ -2,15 +2,20 @@ package io.onedev.server.web.behavior.infinitescroll;import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit;+import javax.annotation.Nullable;+import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.head.JavaScriptReferenceHeaderItem;import org.apache.wicket.markup.head.OnDomReadyHeaderItem;import org.apache.wicket.request.IRequestParameters;import org.apache.wicket.request.cycle.RequestCycle;+import org.unbescape.javascript.JavaScriptEscape;import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;+import io.onedev.server.web.util.ajaxlistener.DisableGlobalLoadingIndicatorListener;public abstract class InfiniteScrollBehavior extends AbstractPostAjaxBehavior {@@ -22,6 +27,12 @@ public abstract class InfiniteScrollBehavior extends AbstractPostAjaxBehavior {this.pageSize = pageSize;}+ @Override+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {+ super.updateAjaxAttributes(attributes);+ attributes.getAjaxCallListeners().add(new DisableGlobalLoadingIndicatorListener());+ }+@Overrideprotected void respond(AjaxRequestTarget target) {IRequestParameters params = RequestCycle.get().getRequest().getPostParameters();@@ -35,6 +46,11 @@ public abstract class InfiniteScrollBehavior extends AbstractPostAjaxBehavior {getComponent().getMarkupId()));}+ @Nullable+ protected String getItemSelector() {+ return null;+ }+protected abstract void appendPage(AjaxRequestTarget target, int page);@Override@@ -42,8 +58,14 @@ public abstract class InfiniteScrollBehavior extends AbstractPostAjaxBehavior {super.renderHead(component, response);response.render(JavaScriptReferenceHeaderItem.forReference(new InfiniteScrollResourceReference()));- String script = String.format("onedev.infiniteScroll.init('%s', %s, %s);",- component.getMarkupId(true), getCallbackFunction(explicit("page")), pageSize);+ String itemSelector;+ if (getItemSelector() != null)+ itemSelector = "'"+JavaScriptEscape.escapeJavaScript(getItemSelector())+"'";+ else+ itemSelector = "undefined";+ String script = String.format("onedev.infiniteScroll.init('%s', %s, %s, %s);",+ component.getMarkupId(true), getCallbackFunction(explicit("page")),+ pageSize, itemSelector);response.render(OnDomReadyHeaderItem.forScript(script));}diff --git a/core/src/main/java/io/onedev/server/web/behavior/infinitescroll/infinite-scroll.js b/core/src/main/java/io/onedev/server/web/behavior/infinitescroll/infinite-scroll.jsindex 2a7fa0f10f..11542abd84 100644--- a/core/src/main/java/io/onedev/server/web/behavior/infinitescroll/infinite-scroll.js+++ b/core/src/main/java/io/onedev/server/web/behavior/infinitescroll/infinite-scroll.js@@ -1,9 +1,10 @@onedev.infiniteScroll = {- init: function(containerId, callback, pageSize) {+ init: function(containerId, callback, pageSize, itemSelector) {var $container = $("#" + containerId);$container.data("callback", callback);$container.data("page", 1);$container.data("pageSize", pageSize);+ $container.data("itemSelector", itemSelector);$container.scroll(function() {onedev.infiniteScroll.check(containerId);});@@ -16,14 +17,16 @@ onedev.infiniteScroll = {function isInViewPort($item) {var tolerate = 5;return $item.offset().top>$container.offset().top-tolerate- && $item.offset().top+$item.outerHeight()<$container.offset().top+$container.height()+tolerate;+ && $item.offset().top+$item.outerHeight()<$container.offset().top+$container.outerHeight()+tolerate;};var $items;- if ($container.is("ul"))- $items = $container.children();+ if ($container.data("itemSelector"))+ $items = $container.find($container.data("itemSelector"));else- $items = $container.find(">table>tbody>tr");+ $items = $container.children();+var $lastItem = $items.last();+var page = $container.data("page");var pageSize = $container.data("pageSize");if ($container.find(".loading-indicator").length == 0@@ -31,10 +34,12 @@ onedev.infiniteScroll = {page++;$container.data("page", page);if ($container.is("ul")) {- $container.append("<li class='loading-indicator'><img src='/img/ajax-indicator.gif'></img></li>");+ $container.append("<li class='loading-indicator' style='text-align:center;'><img src='/img/ajax-indicator.gif'></img></li>");+ } else if ($container.is("div")) {+ $container.append("<div class='loading-indicator' style='text-align:center;'><img src='/img/ajax-indicator.gif'></img></div>");} else {var colspan = $lastItem.children().length;- $lastItem.parent().append("<tr class='loading-indicator'><td colspan='" + colspan + "'><img src='/img/ajax-indicator.gif'></img></td></tr>");+ $lastItem.parent().append("<tr class='loading-indicator'><td colspan='" + colspan + "' style='text-align:center;'><img src='/img/ajax-indicator.gif'></img></td></tr>");}$container.jumpIntoView(".loading-indicator");$container.data("callback")(page);diff --git a/core/src/main/java/io/onedev/server/web/behavior/inputassist/AssistPanel.java b/core/src/main/java/io/onedev/server/web/behavior/inputassist/AssistPanel.javaindex 5ba954e404..87069c2609 100644--- a/core/src/main/java/io/onedev/server/web/behavior/inputassist/AssistPanel.java+++ b/core/src/main/java/io/onedev/server/web/behavior/inputassist/AssistPanel.java@@ -54,6 +54,11 @@ class AssistPanel extends Panel {suggestionsContainer.add(new InfiniteScrollBehavior(PAGE_SIZE) {+ @Override+ protected String getItemSelector() {+ return ">table>tbody>tr";+ }+@Overrideprotected void appendPage(AjaxRequestTarget target, int page) {for (int i=(page-1)*PAGE_SIZE; i<page*PAGE_SIZE; i++) {diff --git a/core/src/main/java/io/onedev/server/web/component/issuelist/IssueListPanel.java b/core/src/main/java/io/onedev/server/web/component/issuelist/IssueListPanel.javaindex 9f1c089223..c20bb044c4 100644--- a/core/src/main/java/io/onedev/server/web/component/issuelist/IssueListPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/issuelist/IssueListPanel.java@@ -38,8 +38,6 @@ import org.apache.wicket.request.cycle.RequestCycle;import org.slf4j.Logger;import org.slf4j.LoggerFactory;-import com.google.common.collect.Lists;-import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;import io.onedev.server.OneDev;import io.onedev.server.manager.IssueManager;@@ -48,8 +46,6 @@ import io.onedev.server.model.Issue;import io.onedev.server.model.Project;import io.onedev.server.model.User;import io.onedev.server.model.support.issue.IssueField;-import io.onedev.server.model.support.issue.query.AndCriteria;-import io.onedev.server.model.support.issue.query.IssueCriteria;import io.onedev.server.model.support.issue.query.IssueQuery;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.DateUtils;@@ -79,28 +75,21 @@ public abstract class IssueListPanel extends GenericPanel<String> {@Overrideprotected IssueQuery load() {- IssueQuery parsedQuery = null;try {- parsedQuery = IssueQuery.parse(getProject(), getQuery(), true);- if (SecurityUtils.getUser() == null && parsedQuery.needsLogin()) {+ IssueQuery additionalQuery = IssueQuery.parse(getProject(), getQuery(), true);+ if (SecurityUtils.getUser() == null && additionalQuery.needsLogin()) {error("Please login to perform this query");- parsedQuery = null;- } else if (getBaseCriteria() != null) {- if (parsedQuery.getCriteria() != null) {- List<IssueCriteria> criterias = Lists.newArrayList(getBaseCriteria(), parsedQuery.getCriteria());- parsedQuery = new IssueQuery(new AndCriteria(criterias), parsedQuery.getSorts());- } else {- parsedQuery = new IssueQuery(getBaseCriteria(), parsedQuery.getSorts());- }+ } else {+ if (SecurityUtils.getUser() == null && getBaseQuery().needsLogin())+ error("Please login to show the issues");+ else+ return IssueQuery.merge(getBaseQuery(), additionalQuery);}} catch (Exception e) {logger.error("Error parsing issue query: " + getQuery(), e);- if (StringUtils.isNotBlank(e.getMessage()))- error(e.getMessage());- else- error("Malformed issue query");+ error(e.getMessage());}- return parsedQuery;+ return null;}};@@ -135,8 +124,9 @@ public abstract class IssueListPanel extends GenericPanel<String> {protected abstract Project getProject();- @Nullable- protected abstract IssueCriteria getBaseCriteria();+ protected IssueQuery getBaseQuery() {+ return new IssueQuery();+ }protected abstract PagingHistorySupport getPagingHistorySupport();diff --git a/core/src/main/java/io/onedev/server/web/page/base/base.js b/core/src/main/java/io/onedev/server/web/page/base/base.jsindex 296445951d..942e713502 100644--- a/core/src/main/java/io/onedev/server/web/page/base/base.js+++ b/core/src/main/java/io/onedev/server/web/page/base/base.js@@ -605,6 +605,20 @@ onedev.server = {}},+ setupAlertClose: function() {+ function installListener($container) {+ $container.find(".alert").on("close.bs.alert", function() {+ setTimeout(function() {+ $(window).resize();+ }, 0);+ });+ }+ $(document).on("elementReplaced", function(event, componentId) {+ installListener($("#" + componentId));+ });+ installListener($(document));+ },+setupInputClear: function() {function installClearer($container) {$container.find(".clearable-wrapper").each(function() {@@ -646,6 +660,7 @@ onedev.server = {onedev.server.mouseState.track();onedev.server.ajaxRequests.track();onedev.server.setupInputClear();+ onedev.server.setupAlertClose();$(document).keydown(function(e) {if (e.keyCode == 27)diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BacklogColumnPanel.html b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BacklogColumnPanel.htmlnew file mode 100644index 0000000000..477196dc5e--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BacklogColumnPanel.html@@ -0,0 +1,9 @@+<wicket:panel>+ <div class="content">+ <div class="head clearfix">+ <span class="pull-left">Backlog</span>+ <span wicket:id="count" class="badge pull-right"></span>+ </div>+ <div wicket:id="body" class="body"></div>+ </div>+</wicket:panel>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BacklogColumnPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BacklogColumnPanel.javanew file mode 100644index 0000000000..beb9f44dae--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BacklogColumnPanel.java@@ -0,0 +1,79 @@+package io.onedev.server.web.page.project.issues.issueboards;++import java.util.ArrayList;+import java.util.List;++import javax.annotation.Nullable;++import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.head.OnDomReadyHeaderItem;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.panel.Panel;+import org.apache.wicket.model.LoadableDetachableModel;++import io.onedev.server.OneDev;+import io.onedev.server.manager.IssueManager;+import io.onedev.server.model.Issue;+import io.onedev.server.model.Project;+import io.onedev.server.model.support.issue.query.IssueQuery;+import io.onedev.server.web.WebConstants;++@SuppressWarnings("serial")+abstract class BacklogColumnPanel extends Panel {++ public BacklogColumnPanel(String id) {+ super(id);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ add(new Label("count", new LoadableDetachableModel<String>() {++ @Override+ protected String load() {+ return String.valueOf(OneDev.getInstance(IssueManager.class)+ .count(getProject(), getBacklogQuery().getCriteria()));+ }++ }) {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(getBacklogQuery() != null);+ }++ });++ add(new CardListPanel("body") {++ @Override+ protected List<Issue> queryIssues(int page) {+ if (getBacklogQuery() != null) {+ return OneDev.getInstance(IssueManager.class).query(getProject(), getBacklogQuery(),+ page*WebConstants.PAGE_SIZE, WebConstants.PAGE_SIZE);+ } else {+ return new ArrayList<>();+ }+ }++ });+ setOutputMarkupId(true);+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ String script = String.format("onedev.server.issueBoards.onColumnDomReady('%s');",+ getMarkupId());+ response.render(OnDomReadyHeaderItem.forScript(script));+ }++ protected abstract Project getProject();++ @Nullable+ protected abstract IssueQuery getBacklogQuery();++}diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BoardCardPanel.html b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BoardCardPanel.htmlnew file mode 100644index 0000000000..954724aa95--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BoardCardPanel.html@@ -0,0 +1,5 @@+<wicket:panel>+ <a wicket:id="number" class="number"><span wicket:id="label"></span></a>+ <span wicket:id="title" class="title"></span>+ <div wicket:id="state" class="state"></div>+</wicket:panel>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BoardCardPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BoardCardPanel.javanew file mode 100644index 0000000000..7a02dc7234--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BoardCardPanel.java@@ -0,0 +1,56 @@+package io.onedev.server.web.page.project.issues.issueboards;++import org.apache.wicket.behavior.AttributeAppender;+import org.apache.wicket.markup.html.WebMarkupContainer;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.link.BookmarkablePageLink;+import org.apache.wicket.markup.html.link.Link;+import org.apache.wicket.markup.html.panel.Panel;+import org.apache.wicket.model.AbstractReadOnlyModel;++import io.onedev.server.model.Issue;+import io.onedev.server.model.support.issue.workflow.StateSpec;+import io.onedev.server.web.page.project.issues.issuedetail.activities.IssueActivitiesPage;++@SuppressWarnings("serial")+abstract class BoardCardPanel extends Panel {++ public BoardCardPanel(String id) {+ super(id);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ Link<Void> link = new BookmarkablePageLink<Void>("number",+ IssueActivitiesPage.class, IssueActivitiesPage.paramsOf(getIssue(), null));+ link.add(new Label("label", "#" + getIssue().getNumber()));+ add(link);++ add(new Label("title", new AbstractReadOnlyModel<String>() {++ @Override+ public String getObject() {+ return getIssue().getTitle();+ }++ }));+ add(new WebMarkupContainer("state") {++ @Override+ protected void onInitialize() {+ super.onInitialize();+ String state = getIssue().getState();+ StateSpec stateSpec = getIssue().getProject().getIssueWorkflow().getStateSpec(state);+ add(AttributeAppender.append("style", "background:" + stateSpec.getColor() + ";"));+ add(AttributeAppender.append("title", state));+ }++ });++ setOutputMarkupId(true);+ }++ protected abstract Issue getIssue();+}diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BoardColumnPanel.html b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BoardColumnPanel.htmlindex bd91677424..f9c403580e 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BoardColumnPanel.html+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BoardColumnPanel.html@@ -1,10 +1,11 @@<wicket:panel><div wicket:id="content" class="content">- <div wicket:id="head" class="head">- <a wicket:id="avatarLink"></a>- <a wicket:id="userLink"></a>- <span wicket:id="title"></span>+ <div wicket:id="head" class="head clearfix">+ <a wicket:id="avatarLink" class="pull-left"></a>+ <a wicket:id="userLink" class="pull-left"></a>+ <span wicket:id="title" class="pull-left"></span>+ <span wicket:id="count" class="badge pull-right"></span></div>- <div class="body"></div>+ <div wicket:id="body" class="body"></div></div></wicket:panel>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BoardColumnPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BoardColumnPanel.javaindex 93a0629773..bb16bf098f 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BoardColumnPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BoardColumnPanel.java@@ -1,19 +1,34 @@package io.onedev.server.web.page.project.issues.issueboards;+import java.util.ArrayList;+import java.util.List;++import javax.annotation.Nullable;+import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.head.OnDomReadyHeaderItem;import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.panel.Panel;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.LoadableDetachableModel;import io.onedev.server.OneDev;+import io.onedev.server.manager.IssueManager;import io.onedev.server.manager.UserManager;import io.onedev.server.model.Issue;import io.onedev.server.model.Milestone;import io.onedev.server.model.Project;import io.onedev.server.model.User;import io.onedev.server.model.support.issue.IssueBoard;+import io.onedev.server.model.support.issue.query.ChoiceFieldCriteria;+import io.onedev.server.model.support.issue.query.FieldUnaryCriteria;+import io.onedev.server.model.support.issue.query.IssueCriteria;+import io.onedev.server.model.support.issue.query.IssueQuery;+import io.onedev.server.model.support.issue.query.IssueQueryLexer;+import io.onedev.server.model.support.issue.query.MilestoneCriteria;+import io.onedev.server.model.support.issue.query.StateCriteria;import io.onedev.server.model.support.issue.workflow.IssueWorkflow;import io.onedev.server.util.EditContext;import io.onedev.server.util.OneContext;@@ -21,18 +36,54 @@ import io.onedev.server.util.inputspec.InputSpec;import io.onedev.server.util.inputspec.choiceinput.ChoiceInput;import io.onedev.server.util.inputspec.choiceinput.choiceprovider.ChoiceProvider;import io.onedev.server.util.inputspec.userchoiceinput.UserChoiceInput;+import io.onedev.server.web.WebConstants;import io.onedev.server.web.component.avatar.AvatarLink;import io.onedev.server.web.component.link.UserLink;import io.onedev.server.web.util.ComponentContext;-import io.onedev.utils.ColorUtils;@SuppressWarnings("serial")abstract class BoardColumnPanel extends Panel implements EditContext {+ private final IModel<IssueQuery> queryModel = new LoadableDetachableModel<IssueQuery>() {++ @Override+ protected IssueQuery load() {+ IssueQuery boardQuery = getBoardQuery();+ if (boardQuery != null) {+ List<IssueCriteria> criterias = new ArrayList<>();+ if (boardQuery.getCriteria() != null)+ criterias.add(boardQuery.getCriteria());+ if (getMilestone() != null)+ criterias.add(new MilestoneCriteria(getMilestone().getName(), IssueQueryLexer.Is));+ String identifyField = getBoard().getIdentifyField();+ if (identifyField.equals(Issue.STATE)) {+ criterias.add(new StateCriteria(getColumn(), IssueQueryLexer.Is));+ } else {+ if (getColumn() != null) {+ criterias.add(new ChoiceFieldCriteria(identifyField,+ getColumn(), -1, IssueQueryLexer.Is, false));+ } else {+ criterias.add(new FieldUnaryCriteria(identifyField, IssueQueryLexer.IsEmpty));+ }+ }+ return new IssueQuery(IssueCriteria.of(criterias), boardQuery.getSorts());+ } else {+ return null;+ }+ }++ };+public BoardColumnPanel(String id) {super(id);}+ @Override+ protected void onDetach() {+ queryModel.detach();+ super.onDetach();+ }+@Overrideprotected void onInitialize() {super.onInitialize();@@ -43,33 +94,28 @@ abstract class BoardColumnPanel extends Panel implements EditContext {String title;String color = null;User user = null;- if (getColumnIndex() != -1) {- IssueWorkflow workflow = getProject().getIssueWorkflow();- String columnName = getBoard().getColumns().get(getColumnIndex());- String identifyField = getBoard().getIdentifyField();- if (columnName != null) {- title = columnName;- if (identifyField.equals(Issue.STATE)) {- color = workflow.getStateSpec(columnName).getColor();- } else {- InputSpec field = workflow.getFieldSpec(identifyField);- if (field instanceof ChoiceInput) {- ChoiceProvider choiceProvider = ((ChoiceInput)field).getChoiceProvider();- OneContext.push(new ComponentContext(this));- try {- color = choiceProvider.getChoices(true).get(columnName);- } finally {- OneContext.pop();- }- } else if (field instanceof UserChoiceInput) {- user = OneDev.getInstance(UserManager.class).findByName(columnName);+ IssueWorkflow workflow = getProject().getIssueWorkflow();+ String identifyField = getBoard().getIdentifyField();+ if (getColumn() != null) {+ title = getColumn();+ if (identifyField.equals(Issue.STATE)) {+ color = workflow.getStateSpec(getColumn()).getColor();+ } else {+ InputSpec field = workflow.getFieldSpec(identifyField);+ if (field instanceof ChoiceInput) {+ ChoiceProvider choiceProvider = ((ChoiceInput)field).getChoiceProvider();+ OneContext.push(new ComponentContext(this));+ try {+ color = choiceProvider.getChoices(true).get(getColumn());+ } finally {+ OneContext.pop();}+ } else if (field instanceof UserChoiceInput) {+ user = OneDev.getInstance(UserManager.class).findByName(getColumn());}- } else {- title = workflow.getFieldSpec(identifyField).getNameOfEmptyValue();}} else {- title = "Backlog";+ title = workflow.getFieldSpec(identifyField).getNameOfEmptyValue();}WebMarkupContainer head = new WebMarkupContainer("head");@@ -82,16 +128,45 @@ abstract class BoardColumnPanel extends Panel implements EditContext {head.add(new WebMarkupContainer("avatarLink").setVisible(false));head.add(new WebMarkupContainer("userLink").setVisible(false));}+head.add(AttributeAppender.append("title", getBoard().getIdentifyField()));content.add(head);if (color != null) {- head.add(AttributeAppender.append("style",- "background:" + color + ";border-bottom-color:" + color + ";"));- if (!ColorUtils.isLight(color))- head.add(AttributeAppender.append("style", "color:white;"));+ head.add(AttributeAppender.append("style", "border-top-color:" + color + ";"));content.add(AttributeAppender.append("style", "border-color:" + color + ";"));}+ head.add(new Label("count", new LoadableDetachableModel<String>() {++ @Override+ protected String load() {+ return String.valueOf(OneDev.getInstance(IssueManager.class).count(getProject(), queryModel.getObject().getCriteria()));+ }++ }) {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(queryModel.getObject() != null);+ }++ });++ content.add(new CardListPanel("body") {++ @Override+ protected List<Issue> queryIssues(int page) {+ IssueQuery query = queryModel.getObject();+ if (query != null) {+ return OneDev.getInstance(IssueManager.class).query(getProject(), query,+ page*WebConstants.PAGE_SIZE, WebConstants.PAGE_SIZE);+ } else {+ return new ArrayList<>();+ }+ }++ });setOutputMarkupId(true);}@@ -109,11 +184,15 @@ abstract class BoardColumnPanel extends Panel implements EditContext {}protected abstract Project getProject();-+protected abstract IssueBoard getBoard();-++ @Nullableprotected abstract Milestone getMilestone();- protected abstract int getColumnIndex();+ protected abstract String getColumn();++ @Nullable+ protected abstract IssueQuery getBoardQuery();}diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BoardEditPage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BoardEditPage.javaindex c65ee4c4ed..bfe5bcf8f2 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BoardEditPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BoardEditPage.java@@ -60,7 +60,7 @@ public class BoardEditPage extends IssuesPage {getProject().setIssueBoards(boards);OneDev.getInstance(ProjectManager.class).save(getProject());Session.get().success("Issue board saved");- setResponsePage(IssueBoardsPage.class, IssueBoardsPage.paramsOf(getProject(), board, null, null));+ setResponsePage(IssueBoardsPage.class, IssueBoardsPage.paramsOf(getProject(), board, null, false, null, null));}}diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/CardListPanel.html b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/CardListPanel.htmlnew file mode 100644index 0000000000..6604754402--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/CardListPanel.html@@ -0,0 +1,3 @@+<wicket:panel>+ <div wicket:id="cards" class="card"></div>+</wicket:panel>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/CardListPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/CardListPanel.javanew file mode 100644index 0000000000..6a41b3f3a8--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/CardListPanel.java@@ -0,0 +1,66 @@+package io.onedev.server.web.page.project.issues.issueboards;++import java.util.List;++import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.markup.html.panel.Panel;+import org.apache.wicket.markup.repeater.RepeatingView;++import io.onedev.server.model.Issue;+import io.onedev.server.web.WebConstants;+import io.onedev.server.web.behavior.infinitescroll.InfiniteScrollBehavior;++@SuppressWarnings("serial")+abstract class CardListPanel extends Panel {++ public CardListPanel(String id) {+ super(id);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();+ RepeatingView cardsView = new RepeatingView("cards");+ for (Issue issue: queryIssues(0)) {+ cardsView.add(new BoardCardPanel(cardsView.newChildId()) {++ @Override+ protected Issue getIssue() {+ return issue;+ }++ });+ }+ add(cardsView);++ add(new InfiniteScrollBehavior(WebConstants.PAGE_SIZE) {++ @Override+ protected String getItemSelector() {+ return ">.card";+ }++ @Override+ protected void appendPage(AjaxRequestTarget target, int page) {+ for (Issue issue: queryIssues(page-1)) {+ BoardCardPanel card = new BoardCardPanel(cardsView.newChildId()) {++ @Override+ protected Issue getIssue() {+ return issue;+ }++ };+ cardsView.add(card);+ String script = String.format("$('#%s').append('<div id=\"%s\"></div>');",+ getMarkupId(), card.getMarkupId());+ target.prependJavaScript(script);+ target.add(card);+ }+ }++ });+ }++ protected abstract List<Issue> queryIssues(int page);+}diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/IssueBoardsPage.html b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/IssueBoardsPage.htmlindex 0fff4fefbf..e0a432c566 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/IssueBoardsPage.html+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/IssueBoardsPage.html@@ -7,18 +7,19 @@<form wicket:id="query" class="clearable-wrapper"><div class="input-group"><span class="input-group-btn">- <a wicket:id="boardMenu" class="board-selector btn btn-default">+ <a wicket:id="boardMenu" title="Board" class="board-selector btn btn-default"><i class="fa fa-columns"></i><span wicket:id="board"></span><i class="fa fa-caret-down"></i></a>- <a wicket:id="milestoneMenu" class="milestone-selector btn btn-default">+ <a wicket:id="backlog" class="backlog btn btn-default"><i class="fa fa-inbox"></i> Backlog</a>+ <a wicket:id="milestoneMenu" title="Milestone" class="milestone-selector btn btn-default"><i class="fa fa-ext fa-milestone"></i><span wicket:id="milestone"></span><i class="fa fa-caret-down"></i></a></span>- <input wicket:id="input" spellcheck="false" autocomplete="off" class="form-control no-autofocus" placeholder="Filter issues"></input>+ <input wicket:id="input" spellcheck="false" autocomplete="off" class="form-control no-autofocus"></input><span class="input-group-btn"><button wicket:id="submit" type="submit" class="btn btn-default" title="Query"><i class="fa fa-search"></i></button></span>@@ -26,9 +27,9 @@</form><a wicket:id="newBoard" class="btn btn-success add-new"><i class="fa fa-plus"></i> New Board</a></div>+ <div wicket:id="feedback" class="feedback"></div><div class="body">- <div wicket:id="backlog" class="backlog-column board-column"></div>- <div wicket:id="columns" class="board-column"></div>+ <div wicket:id="columns" class="column"></div></div></wicket:fragment><wicket:fragment wicket:id="noBoardsFrag">diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/IssueBoardsPage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/IssueBoardsPage.javaindex 411ee4a8a4..1b94103b9d 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/IssueBoardsPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/IssueBoardsPage.java@@ -30,7 +30,10 @@ import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.Model;import org.apache.wicket.request.mapper.parameter.PageParameters;+import org.slf4j.Logger;+import org.slf4j.LoggerFactory;+import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;import edu.emory.mathcs.backport.java.util.Collections;import io.onedev.server.OneDev;import io.onedev.server.exception.OneException;@@ -38,6 +41,7 @@ import io.onedev.server.manager.ProjectManager;import io.onedev.server.model.Milestone;import io.onedev.server.model.Project;import io.onedev.server.model.support.issue.IssueBoard;+import io.onedev.server.model.support.issue.query.IssueQuery;import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.behavior.IssueQueryBehavior;import io.onedev.server.web.behavior.sortable.SortBehavior;@@ -52,18 +56,93 @@ import io.onedev.server.web.util.ConfirmOnClick;@SuppressWarnings("serial")public class IssueBoardsPage extends IssuesPage {+ private static final Logger logger = LoggerFactory.getLogger(IssueBoardsPage.class);+private static final String PARAM_BOARD = "board";private static final String PARAM_MILESTONE = "milestone";+ private static final String PARAM_BACKLOG = "backlog";+private static final String PARAM_QUERY = "query";+ private static final String PARAM_BACKLOG_QUERY = "backlog-query";+private final IModel<IssueBoard> boardModel;private final IModel<Milestone> milestoneModel;+ private final boolean backlog;+private final String query;+ private final String backlogQuery;++ private final IModel<IssueQuery> parsedQueryModel = new LoadableDetachableModel<IssueQuery>() {++ @Override+ protected IssueQuery load() {+ return parse(false, getBoard().getBaseQuery(), query);+ }++ };++ private final IModel<IssueQuery> parsedBacklogQueryModel = new LoadableDetachableModel<IssueQuery>() {++ @Override+ protected IssueQuery load() {+ return parse(true, getBoard().getBacklogBaseQuery(), backlogQuery);+ }++ };++ private NotificationPanel feedback;++ private IssueQuery parse(boolean backlog, @Nullable String baseQueryString, @Nullable String additionalQueryString) {+ IssueQuery additionalQuery;+ try {+ additionalQuery = IssueQuery.parse(getProject(), additionalQueryString, true);+ } catch (Exception e) {+ String prefix;+ if (backlog)+ prefix = "Error parsing backlog query: ";+ else+ prefix = "Error parsing issue query: ";+ logger.error(prefix + additionalQueryString, e);+ error(prefix + e.getMessage());+ return null;+ }++ if (SecurityUtils.getUser() == null && additionalQuery.needsLogin()) {+ error("Please login to perform this query");+ return null;+ } else {+ IssueQuery baseQuery;+ try {+ baseQuery = IssueQuery.parse(getProject(), baseQueryString, true);+ } catch (Exception e) {+ String prefix;+ if (backlog)+ prefix = "Error parsing backlog base query: ";+ else+ prefix = "Error parsing base query: ";++ logger.error(prefix + baseQueryString, e);+ error(prefix + e.getMessage());+ return null;+ }+ if (SecurityUtils.getUser() == null && baseQuery.needsLogin()) {+ if (backlog)+ error("Login is required for backlog base query");+ else+ error("Login is required for base query");+ return null;+ } else {+ return IssueQuery.merge(baseQuery, additionalQuery);+ }+ }+ }+public IssueBoardsPage(PageParameters params) {super(params);@@ -115,7 +194,9 @@ public class IssueBoardsPage extends IssuesPage {};+ backlog = params.get(PARAM_BACKLOG).toBoolean() && getMilestone() != null;query = params.get(PARAM_QUERY).toString();+ backlogQuery = params.get(PARAM_BACKLOG_QUERY).toString();}private List<Milestone> getMilestones() {@@ -135,6 +216,8 @@ public class IssueBoardsPage extends IssuesPage {protected void onDetach() {boardModel.detach();milestoneModel.detach();+ parsedQueryModel.detach();+ parsedBacklogQueryModel.detach();super.onDetach();}@@ -177,7 +260,9 @@ public class IssueBoardsPage extends IssuesPage {protected void populateItem(ListItem<IssueBoard> item) {item.add(new WebMarkupContainer("dragHandle").setVisible(SecurityUtils.canManage(getProject())));- PageParameters params = IssueBoardsPage.paramsOf(getProject(), item.getModelObject(), getMilestone(), query);+ PageParameters params = IssueBoardsPage.paramsOf(+ getProject(), item.getModelObject(), getMilestone(),+ backlog, backlogQuery, query);Link<Void> link = new BookmarkablePageLink<Void>("select", IssueBoardsPage.class, params);link.add(new Label("name", item.getModelObject().getName()));item.add(link);@@ -202,9 +287,9 @@ public class IssueBoardsPage extends IssuesPage {PageParameters params;if (item.getModelObject().getName().equals(getBoard().getName()))- params = IssueBoardsPage.paramsOf(getProject(), null, getMilestone(), query);+ params = IssueBoardsPage.paramsOf(getProject(), null, getMilestone(), backlog, query, backlogQuery);else- params = IssueBoardsPage.paramsOf(getProject(), getBoard(), getMilestone(), query);+ params = IssueBoardsPage.paramsOf(getProject(), getBoard(), getMilestone(), backlog, query, backlogQuery);setResponsePage(IssueBoardsPage.class, params);}@@ -240,6 +325,28 @@ public class IssueBoardsPage extends IssuesPage {return fragment;}+ });+ form.add(new Link<Void>("backlog") {++ @Override+ protected void onInitialize() {+ super.onInitialize();+ if (backlog)+ add(AttributeAppender.append("class", "active"));+ }++ @Override+ public void onClick() {+ PageParameters params = paramsOf(getProject(), getBoard(), getMilestone(), !backlog, query, backlogQuery);+ setResponsePage(IssueBoardsPage.class, params);+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(getMilestone() != null);+ }+});form.add(new DropdownLink("milestoneMenu") {@@ -280,7 +387,7 @@ public class IssueBoardsPage extends IssuesPage {@Overrideprotected void populateItem(ListItem<Milestone> item) {Milestone milestone = item.getModelObject();- PageParameters params = IssueBoardsPage.paramsOf(getProject(), getBoard(), milestone, query);+ PageParameters params = IssueBoardsPage.paramsOf(getProject(), getBoard(), milestone, backlog, query, backlogQuery);Link<Void> link = new BookmarkablePageLink<Void>("select", IssueBoardsPage.class, params);link.add(new Label("name", milestone.getName()));item.add(link);@@ -321,8 +428,18 @@ public class IssueBoardsPage extends IssuesPage {});- TextField<String> input = new TextField<String>("input", Model.of(query));+ IModel<String> model;+ if (backlog)+ model = Model.of(backlogQuery);+ else+ model = Model.of(query);+ TextField<String> input = new TextField<String>("input", model);input.add(new IssueQueryBehavior(projectModel));+ if (backlog)+ input.add(AttributeAppender.append("placeholder", "Filter backlog issues"));+ else+ input.add(AttributeAppender.append("placeholder", "Filter issues"));+form.add(input);form.add(new Button("submit") {@@ -330,7 +447,15 @@ public class IssueBoardsPage extends IssuesPage {@Overridepublic void onSubmit() {super.onSubmit();- PageParameters params = IssueBoardsPage.paramsOf(getProject(), getBoard(), getMilestone(), input.getModelObject());+ PageParameters params;+ if (backlog) {+ params = IssueBoardsPage.paramsOf(getProject(), getBoard(),+ getMilestone(), backlog, query, input.getModelObject());+ } else {+ params = IssueBoardsPage.paramsOf(getProject(), getBoard(),+ getMilestone(), backlog, input.getModelObject(), backlogQuery);+ }+setResponsePage(IssueBoardsPage.class, params);}@@ -338,7 +463,8 @@ public class IssueBoardsPage extends IssuesPage {fragment.add(form);- fragment.add(new BookmarkablePageLink<Void>("newBoard", NewBoardPage.class, NewBoardPage.paramsOf(getProject())) {+ fragment.add(new BookmarkablePageLink<Void>("newBoard",+ NewBoardPage.class, NewBoardPage.paramsOf(getProject())) {@Overrideprotected void onConfigure() {@@ -348,39 +474,27 @@ public class IssueBoardsPage extends IssuesPage {});- fragment.add(new BoardColumnPanel("backlog") {-- @Override- protected Project getProject() {- return IssueBoardsPage.this.getProject();- }-- @Override- protected IssueBoard getBoard() {- return IssueBoardsPage.this.getBoard();- }+ fragment.add(feedback = new NotificationPanel("feedback", IssueBoardsPage.this));+ feedback.setOutputMarkupPlaceholderTag(true);++ RepeatingView columnsView = new RepeatingView("columns");+ if (backlog) {+ columnsView.add(new BacklogColumnPanel("backlog") {- @Override- protected Milestone getMilestone() {- return IssueBoardsPage.this.getMilestone();- }+ @Override+ protected Project getProject() {+ return IssueBoardsPage.this.getProject();+ }- @Override- protected int getColumnIndex() {- return -1;- }-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(getMilestone() != null);- }-- });+ @Override+ protected IssueQuery getBacklogQuery() {+ return parsedBacklogQueryModel.getObject();+ }++ });+ }- RepeatingView columnsView = new RepeatingView("columns");- for (int i=0; i<getBoard().getColumns().size(); i++) {- int index = i;+ for (String column: getBoard().getColumns()) {columnsView.add(new BoardColumnPanel(columnsView.newChildId()) {@Override@@ -399,8 +513,13 @@ public class IssueBoardsPage extends IssuesPage {}@Override- protected int getColumnIndex() {- return index;+ protected String getColumn() {+ return column;+ }++ @Override+ protected IssueQuery getBoardQuery() {+ return parsedQueryModel.getObject();}});@@ -431,14 +550,18 @@ public class IssueBoardsPage extends IssuesPage {}public static PageParameters paramsOf(Project project, @Nullable IssueBoard board,- @Nullable Milestone milestone, @Nullable String query) {+ @Nullable Milestone milestone, boolean backlog, @Nullable String query,+ @Nullable String backlogQuery) {PageParameters params = paramsOf(project);if (board != null)params.add(PARAM_BOARD, board.getName());if (milestone != null)params.add(PARAM_MILESTONE, milestone.getName());+ params.add(PARAM_BACKLOG, backlog);if (query != null)params.add(PARAM_QUERY, query);+ if (backlogQuery != null)+ params.add(PARAM_BACKLOG_QUERY, backlogQuery);return params;}diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/NewBoardPage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/NewBoardPage.javaindex edf90ff86f..1d0bffba6c 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/NewBoardPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/NewBoardPage.java@@ -49,7 +49,7 @@ public class NewBoardPage extends IssuesPage {getProject().setIssueBoards(boards);OneDev.getInstance(ProjectManager.class).save(getProject());Session.get().success("New issue board created");- setResponsePage(IssueBoardsPage.class, IssueBoardsPage.paramsOf(getProject(), board, null, null));+ setResponsePage(IssueBoardsPage.class, IssueBoardsPage.paramsOf(getProject(), board, null, false, null, null));}}diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/issue-boards.css b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/issue-boards.cssindex 4bc94cfc57..d0d6952c6b 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/issue-boards.css+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/issue-boards.css@@ -62,34 +62,81 @@background: #E5E5E5;}+#issue-boards>.feedback .alert {+ margin-top: 20px;+ margin-bottom: 0;+}#issue-boards>.body {position: relative;- overflow-x: auto;- overflow-y: hidden;margin: 0 -20px;/* hack to makes all column of same width and same space */padding: 20px 0 20px 20px;display: flex;}-.board-column {+#issue-boards>.body>.column {flex: 1 1 auto;min-width: 250px;height: 100%;/* hack to makes all column of same width and same space */padding-right: 20px;}-.board-column>.content {+#issue-boards>.body>.column>.content {border: 1px solid #E0E0E0;border-radius: 4px;height: 100%;+ display: flex;+ flex-direction: column;+ background: #F9F9F9;}-.board-column>.content>.head {+#issue-boards>.body>.column>.content>.head {font-weight: bold;padding: 6px 12px;font-size: 15px;border-bottom: 1px solid #E0E0E0;+ border-top: 3px solid #E0E0E0;+}+#issue-boards>.body>.column>.content>.head>* {+ margin-right: 4px;+}+#issue-boards>.body>.column>.content>.head>.badge {+ margin-right: 0;}-.board-column>.content>.body {++#issue-boards>.body>.column>.content>.body {position: relative;+ padding: 12px;overflow: auto;+ height: 100%;+}+#issue-boards>.body>.column>.content>.body>.loading-indicator {+ margin-top: 8px;+}+#issue-boards>.body>.column>.content>.body>.card {+ margin-top: 12px;}+#issue-boards>.body>.column>.content>.body>.card:first-child {+ margin-top: 0;+}++#issue-boards>.body>.column>.content>.body>.card {+ border-radius: 4px;+ padding: 8px 24px 8px 8px;+ background: white;+ position: relative;+ box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0), 0 1px 3px 0 rgba(0, 0, 0, 0.2);+}+#issue-boards>.body>.column>.content>.body>.card>.number {+ margin-right: 8px;+ color: #777;+ text-decoration: none;+ font-size: 12px;+ line-height: 20px;+}+#issue-boards>.body>.column>.content>.body>.card>.state {+ border-radius: 2px;+ width: 12px;+ height: 12px;+ position: absolute;+ right: 8px;+ top: 12px;+}\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/issue-boards.js b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/issue-boards.jsindex 078789fdf0..462de5b6e5 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/issue-boards.js+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/issue-boards.js@@ -12,6 +12,10 @@ onedev.server.issueBoards = {onColumnDomReady: function(containerId) {var $body = $("#" + containerId + ">.content>.body");var ps = new PerfectScrollbar($body[0]);++ // Scroll bar will not show in the flex box without this line+ setTimeout(function() {ps.update();}, 100);+$(window).resize(function() {ps.update();});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.javaindex ce592af7f0..b2b42b2a60 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@@ -37,7 +37,6 @@ 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.WatchStatus;-import io.onedev.server.model.support.issue.query.IssueCriteria;import io.onedev.server.model.support.issue.query.IssueQuery;import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.component.issuelist.IssueListPanel;@@ -387,11 +386,6 @@ public class IssueListPage extends IssuesPage {return IssueListPage.this.getProject();}- @Override- protected IssueCriteria getBaseCriteria() {- return null;- }-@Overrideprotected PagingHistorySupport getPagingHistorySupport() {return pagingHistorySupport;diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/IssueStatsPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/IssueStatsPanel.javaindex 69d0758a4f..a7ae31cf2b 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/IssueStatsPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/IssueStatsPanel.java@@ -1,7 +1,5 @@package io.onedev.server.web.page.project.issues.milestones;-import org.apache.wicket.markup.ComponentTag;-import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.markup.html.link.Link;@@ -30,45 +28,17 @@ class IssueStatsPanel extends GenericPanel<Milestone> {add(new MilestoneProgressBar("progress", getModel()));- IssueCriteria openCriteria = getMilestone().getProject().getIssueWorkflow().getStatesCriteria(StateSpec.Category.OPEN);- if (openCriteria != null) {- Link<Void> link = new BookmarkablePageLink<Void>("open", MilestoneDetailPage.class,- MilestoneDetailPage.paramsOf(getMilestone(), openCriteria.toString()));- link.add(new Label("count", getMilestone().getNumOfOpenIssues() + " open"));- add(link);- } else {- WebMarkupContainer link = new WebMarkupContainer("open") {-- @Override- protected void onComponentTag(ComponentTag tag) {- super.onComponentTag(tag);- tag.setName("span");- }-- };- link.add(new Label("count", getMilestone().getNumOfOpenIssues() + " open"));- add(link);- }+ IssueCriteria openCriteria = getMilestone().getProject().getIssueWorkflow().getCategoryCriteria(StateSpec.Category.OPEN);+ Link<Void> link = new BookmarkablePageLink<Void>("open", MilestoneDetailPage.class,+ MilestoneDetailPage.paramsOf(getMilestone(), openCriteria.toString()));+ link.add(new Label("count", getMilestone().getNumOfOpenIssues() + " open"));+ add(link);- IssueCriteria closedCriteria = getMilestone().getProject().getIssueWorkflow().getStatesCriteria(StateSpec.Category.CLOSED);- if (closedCriteria != null) {- Link<Void> link = new BookmarkablePageLink<Void>("closed", MilestoneDetailPage.class,- MilestoneDetailPage.paramsOf(getMilestone(), closedCriteria.toString()));- link.add(new Label("count", getMilestone().getNumOfClosedIssues() + " closed"));- add(link);- } else {- WebMarkupContainer link = new WebMarkupContainer("closed") {-- @Override- protected void onComponentTag(ComponentTag tag) {- super.onComponentTag(tag);- tag.setName("span");- }-- };- link.add(new Label("count", getMilestone().getNumOfOpenIssues() + " closed"));- add(link);- }+ IssueCriteria closedCriteria = getMilestone().getProject().getIssueWorkflow().getCategoryCriteria(StateSpec.Category.CLOSED);+ link = new BookmarkablePageLink<Void>("closed", MilestoneDetailPage.class,+ MilestoneDetailPage.paramsOf(getMilestone(), closedCriteria.toString()));+ link.add(new Label("count", getMilestone().getNumOfClosedIssues() + " closed"));+ add(link);}}diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneDetailPage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneDetailPage.javaindex 6a8407d1e0..ae8269fc2f 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneDetailPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneDetailPage.java@@ -1,5 +1,7 @@package io.onedev.server.web.page.project.issues.milestones;+import java.util.ArrayList;+import javax.annotation.Nullable;import org.apache.wicket.ajax.AjaxRequestTarget;@@ -15,7 +17,7 @@ import io.onedev.server.OneDev;import io.onedev.server.manager.MilestoneManager;import io.onedev.server.model.Milestone;import io.onedev.server.model.Project;-import io.onedev.server.model.support.issue.query.IssueCriteria;+import io.onedev.server.model.support.issue.query.IssueQuery;import io.onedev.server.model.support.issue.query.IssueQueryLexer;import io.onedev.server.model.support.issue.query.MilestoneCriteria;import io.onedev.server.security.SecurityUtils;@@ -126,8 +128,8 @@ public class MilestoneDetailPage extends IssuesPage {}@Override- protected IssueCriteria getBaseCriteria() {- return new MilestoneCriteria(getMilestone().getName(), IssueQueryLexer.Is);+ protected IssueQuery getBaseQuery() {+ return new IssueQuery(new MilestoneCriteria(getMilestone().getName(), IssueQueryLexer.Is), new ArrayList<>());}@Override