The Unified and Autonomous Development Platform
Add milestone management
Robin Shenabc2ad403df2
diff --git a/core/src/main/java/io/onedev/server/CoreModule.java b/core/src/main/java/io/onedev/server/CoreModule.javaindex 6acd4e41c9..385851239a 100644--- a/core/src/main/java/io/onedev/server/CoreModule.java+++ b/core/src/main/java/io/onedev/server/CoreModule.java@@ -95,6 +95,7 @@ import io.onedev.server.manager.ConfigManager;import io.onedev.server.manager.DataManager;import io.onedev.server.manager.GroupAuthorizationManager;import io.onedev.server.manager.GroupManager;+import io.onedev.server.manager.IssueBoardManager;import io.onedev.server.manager.IssueChangeManager;import io.onedev.server.manager.IssueCommentManager;import io.onedev.server.manager.IssueFieldUnaryManager;@@ -106,6 +107,7 @@ import io.onedev.server.manager.IssueWatchManager;import io.onedev.server.manager.MailManager;import io.onedev.server.manager.MarkdownManager;import io.onedev.server.manager.MembershipManager;+import io.onedev.server.manager.MilestoneManager;import io.onedev.server.manager.ProjectManager;import io.onedev.server.manager.PullRequestCommentManager;import io.onedev.server.manager.PullRequestManager;@@ -138,6 +140,7 @@ import io.onedev.server.manager.impl.DefaultConfigManager;import io.onedev.server.manager.impl.DefaultDataManager;import io.onedev.server.manager.impl.DefaultGroupAuthorizationManager;import io.onedev.server.manager.impl.DefaultGroupManager;+import io.onedev.server.manager.impl.DefaultIssueBoardManager;import io.onedev.server.manager.impl.DefaultIssueChangeManager;import io.onedev.server.manager.impl.DefaultIssueCommentManager;import io.onedev.server.manager.impl.DefaultIssueFieldUnaryManager;@@ -149,6 +152,7 @@ import io.onedev.server.manager.impl.DefaultIssueWatchManager;import io.onedev.server.manager.impl.DefaultMailManager;import io.onedev.server.manager.impl.DefaultMarkdownManager;import io.onedev.server.manager.impl.DefaultMembershipManager;+import io.onedev.server.manager.impl.DefaultMilestoneManager;import io.onedev.server.manager.impl.DefaultProjectManager;import io.onedev.server.manager.impl.DefaultPullRequestCommentManager;import io.onedev.server.manager.impl.DefaultPullRequestManager;@@ -324,7 +328,9 @@ public class CoreModule extends AbstractPluginModule {bind(IssueWatchManager.class).to(DefaultIssueWatchManager.class);bind(IssueChangeManager.class).to(DefaultIssueChangeManager.class);bind(IssueVoteManager.class).to(DefaultIssueVoteManager.class);+ bind(IssueBoardManager.class).to(DefaultIssueBoardManager.class);bind(CacheManager.class).to(DefaultCacheManager.class);+ bind(MilestoneManager.class).to(DefaultMilestoneManager.class);bind(VerificationManager.class).to(DefaultVerificationManager.class);bind(Session.class).toProvider(SessionProvider.class);bind(EntityManager.class).toProvider(SessionProvider.class);diff --git a/core/src/main/java/io/onedev/server/exception/ScriptException.java b/core/src/main/java/io/onedev/server/exception/ScriptException.javaindex 956116d6e5..9c45883678 100644--- a/core/src/main/java/io/onedev/server/exception/ScriptException.java+++ b/core/src/main/java/io/onedev/server/exception/ScriptException.java@@ -5,7 +5,7 @@ public class ScriptException extends OneException {private static final long serialVersionUID = 1L;public ScriptException(String script, RuntimeException cause) {- super("Error evaluating groovy script:\n" + script, cause);+ super("Error evaluating groovy script:\n\n" + script, cause);}}diff --git a/core/src/main/java/io/onedev/server/manager/IssueBoardManager.java b/core/src/main/java/io/onedev/server/manager/IssueBoardManager.javanew file mode 100644index 0000000000..e4709d3c4e--- /dev/null+++ b/core/src/main/java/io/onedev/server/manager/IssueBoardManager.java@@ -0,0 +1,8 @@+package io.onedev.server.manager;++import io.onedev.server.model.IssueBoard;+import io.onedev.server.persistence.dao.EntityManager;++public interface IssueBoardManager extends EntityManager<IssueBoard> {++}diff --git a/core/src/main/java/io/onedev/server/manager/IssueChangeManager.java b/core/src/main/java/io/onedev/server/manager/IssueChangeManager.javaindex 2b34151187..de59b78dd5 100644--- a/core/src/main/java/io/onedev/server/manager/IssueChangeManager.java+++ b/core/src/main/java/io/onedev/server/manager/IssueChangeManager.java@@ -13,13 +13,15 @@ import io.onedev.server.persistence.dao.EntityManager;public interface IssueChangeManager extends EntityManager<IssueChange> {- void changeTitle(Issue issue, String oldTitle);+ void changeTitle(Issue issue, String prevTitle);- void changeDescription(Issue issue, String oldDescription);+ void changeDescription(Issue issue, String prevDescription);++ void changeMilestone(Issue issue, String prevMilestone);void changeFields(Issue issue, Serializable fieldBean, Map<String, IssueField> prevFields,Collection<String> promptedFields);void changeState(Issue issue, Serializable fieldBean, @Nullable String commentContent,- Map<String, IssueField> prevFields, Collection<String> promptedFields);+ String prevState, Map<String, IssueField> prevFields, Collection<String> promptedFields);}diff --git a/core/src/main/java/io/onedev/server/manager/IssueManager.java b/core/src/main/java/io/onedev/server/manager/IssueManager.javaindex c1c646e58e..aa97a35dc6 100644--- a/core/src/main/java/io/onedev/server/manager/IssueManager.java+++ b/core/src/main/java/io/onedev/server/manager/IssueManager.java@@ -24,9 +24,9 @@ public interface IssueManager extends EntityManager<Issue> {void open(Issue issue, Serializable fieldBean);- List<Issue> query(IssueQuery issueQuery, int firstResult, int maxResults);+ List<Issue> query(Project project, IssueQuery issueQuery, int firstResult, int maxResults);- int count(@Nullable IssueCriteria issueCriteria);+ int count(Project project, @Nullable IssueCriteria issueCriteria);List<Issue> query(Project project, @Nullable String term, int count);@@ -43,5 +43,4 @@ public interface IssueManager extends EntityManager<Issue> {void fixUndefinedFieldValues(Project project, Map<UndefinedFieldValue, UndefinedFieldValueResolution> resolutions);void fixFieldValueOrders(Project project);-}diff --git a/core/src/main/java/io/onedev/server/manager/MilestoneManager.java b/core/src/main/java/io/onedev/server/manager/MilestoneManager.javanew file mode 100644index 0000000000..72faaca7d9--- /dev/null+++ b/core/src/main/java/io/onedev/server/manager/MilestoneManager.java@@ -0,0 +1,18 @@+package io.onedev.server.manager;++import javax.annotation.Nullable;++import io.onedev.server.model.Milestone;+import io.onedev.server.model.Project;+import io.onedev.server.persistence.dao.EntityManager;++public interface MilestoneManager extends EntityManager<Milestone> {++ Milestone find(Project project, String name);++ void delete(Milestone milestone, @Nullable Milestone moveIssuesToMilestone);++ void close(Milestone milestone, @Nullable Milestone moveOpenIssuesToMilestone);++ void updateIssueCount(Milestone milestone, boolean closed);+}diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueBoardManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueBoardManager.javanew file mode 100644index 0000000000..1d493ec7e0--- /dev/null+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueBoardManager.java@@ -0,0 +1,20 @@+package io.onedev.server.manager.impl;++import javax.inject.Inject;+import javax.inject.Singleton;++import io.onedev.server.manager.IssueBoardManager;+import io.onedev.server.model.IssueBoard;+import io.onedev.server.persistence.dao.AbstractEntityManager;+import io.onedev.server.persistence.dao.Dao;++@Singleton+public class DefaultIssueBoardManager extends AbstractEntityManager<IssueBoard>+ implements IssueBoardManager {++ @Inject+ public DefaultIssueBoardManager(Dao dao) {+ super(dao);+ }++}diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueChangeManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueChangeManager.javaindex 50c3ca175b..abc2892ee2 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueChangeManager.java+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueChangeManager.java@@ -23,6 +23,7 @@ import io.onedev.server.model.support.LastActivity;import io.onedev.server.model.support.issue.IssueField;import io.onedev.server.model.support.issue.changedata.DescriptionChangeData;import io.onedev.server.model.support.issue.changedata.FieldChangeData;+import io.onedev.server.model.support.issue.changedata.MilestoneChangeData;import io.onedev.server.model.support.issue.changedata.StateChangeData;import io.onedev.server.model.support.issue.changedata.TitleChangeData;import io.onedev.server.persistence.annotation.Transactional;@@ -88,6 +89,25 @@ public class DefaultIssueChangeManager extends AbstractEntityManager<IssueChangelistenerRegistry.post(new IssueChanged(change));}+ @Transactional+ @Override+ public void changeMilestone(Issue issue, String prevMilestone) {+ LastActivity lastActivity = new LastActivity();+ lastActivity.setAction("changed milestone");+ lastActivity.setDate(new Date());+ lastActivity.setUser(SecurityUtils.getUser());+ issueManager.save(issue);++ IssueChange change = new IssueChange();+ change.setIssue(issue);+ change.setDate(new Date());+ change.setUser(SecurityUtils.getUser());+ change.setData(new MilestoneChangeData(prevMilestone, issue.getMilestoneName()));+ save(change);++ listenerRegistry.post(new IssueChanged(change));+ }+@Transactional@Overridepublic void changeFields(Issue issue, Serializable fieldBean, Map<String, IssueField> prevFields,@@ -119,7 +139,7 @@ public class DefaultIssueChangeManager extends AbstractEntityManager<IssueChange@Transactional@Overridepublic void changeState(Issue issue, Serializable fieldBean, @Nullable String commentContent,- Map<String, IssueField> prevFields, Collection<String> promptedFields) {+ String prevState, Map<String, IssueField> prevFields, Collection<String> promptedFields) {long time = System.currentTimeMillis();LastActivity lastActivity = new LastActivity();lastActivity.setAction("changed state to \"" + issue.getState() + "\"");@@ -139,7 +159,7 @@ public class DefaultIssueChangeManager extends AbstractEntityManager<IssueChangecriteria.add(Restrictions.eq("issue", issue));issue.setFieldUnaries(dao.findAll(criteria));- change.setData(new StateChangeData(issue.getState(), prevFields, issue.getEffectiveFields(), commentContent));+ change.setData(new StateChangeData(issue.getState(), prevState, prevFields, issue.getEffectiveFields(), commentContent));save(change);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 abadd7c2e2..e2dada8e42 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@@ -15,9 +15,14 @@ import javax.inject.Inject;import javax.inject.Singleton;import javax.persistence.criteria.CriteriaBuilder;import javax.persistence.criteria.CriteriaQuery;+import javax.persistence.criteria.Join;+import javax.persistence.criteria.JoinType;+import javax.persistence.criteria.Path;+import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;import org.apache.commons.lang3.StringUtils;+import org.hibernate.Session;import org.hibernate.criterion.Order;import org.hibernate.criterion.Restrictions;import org.hibernate.query.Query;@@ -29,12 +34,15 @@ import io.onedev.server.manager.IssueFieldUnaryManager;import io.onedev.server.manager.IssueManager;import io.onedev.server.manager.IssueQuerySettingManager;import io.onedev.server.model.Issue;+import io.onedev.server.model.IssueFieldUnary;import io.onedev.server.model.IssueQuerySetting;import io.onedev.server.model.Project;import io.onedev.server.model.support.LastActivity;import io.onedev.server.model.support.issue.NamedQuery;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.IssueSort;+import io.onedev.server.model.support.issue.query.IssueSort.Direction;import io.onedev.server.model.support.issue.query.QueryBuildContext;import io.onedev.server.model.support.issue.workflow.StateSpec;import io.onedev.server.persistence.annotation.Sessional;@@ -95,6 +103,7 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implementsStateSpec initialState = issue.getProject().getIssueWorkflow().getInitialStateSpec();issueFieldManager.writeFields(issue, fieldBean, initialState.getFields());+listenerRegistry.post(new IssueOpened(issue));}@@ -129,11 +138,51 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implementsreturn nextNumber.getAndIncrement();}+ private Predicate[] getPredicates(IssueCriteria criteria, Project project, QueryBuildContext context) {+ List<Predicate> predicates = new ArrayList<>();+ predicates.add(context.getBuilder().equal(context.getRoot().get("project"), project));+ if (criteria != null)+ predicates.add(criteria.getPredicate(context));+ return predicates.toArray(new Predicate[0]);+ }++ public CriteriaQuery<Issue> buildCriteriaQuery(Session session, Project project, IssueQuery issueQuery) {+ CriteriaBuilder builder = session.getCriteriaBuilder();+ CriteriaQuery<Issue> query = builder.createQuery(Issue.class);+ Root<Issue> root = query.from(Issue.class);++ QueryBuildContext context = new QueryBuildContext(root, builder);+ query.where(getPredicates(issueQuery.getCriteria(), project, context));++ List<javax.persistence.criteria.Order> orders = new ArrayList<>();+ for (IssueSort sort: issueQuery.getSorts()) {+ if (Issue.BUILTIN_FIELDS.containsKey(sort.getField())) {+ if (sort.getDirection() == Direction.ASCENDING)+ orders.add(builder.asc(root.get(Issue.BUILTIN_FIELDS.get(sort.getField()))));+ else+ orders.add(builder.desc(root.get(Issue.BUILTIN_FIELDS.get(sort.getField()))));+ } else {+ Join<Issue, IssueFieldUnary> join = root.join("fieldUnaries", JoinType.LEFT);+ join.on(builder.equal(join.get(IssueFieldUnary.NAME), sort.getField()));+ if (sort.getDirection() == Direction.ASCENDING)+ orders.add(builder.asc(join.get(IssueFieldUnary.ORDINAL)));+ else+ orders.add(builder.desc(join.get(IssueFieldUnary.ORDINAL)));+ }+ }++ Path<String> idPath = root.get("id");+ if (orders.isEmpty())+ orders.add(builder.desc(idPath));+ query.orderBy(orders);++ return query;+ }+@Sessional@Override- public List<Issue> query(IssueQuery issueQuery, int firstResult, int maxResults) {- CriteriaQuery<Issue> criteriaQuery = issueQuery.buildCriteriaQuery(getSession());-+ public List<Issue> query(Project project, IssueQuery issueQuery, int firstResult, int maxResults) {+ CriteriaQuery<Issue> criteriaQuery = buildCriteriaQuery(getSession(), project, issueQuery);Query<Issue> query = getSession().createQuery(criteriaQuery);query.setFirstResult(firstResult);query.setMaxResults(maxResults);@@ -146,13 +195,14 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implements@Sessional@Override- public int count(IssueCriteria issueCriteria) {+ public int count(Project project, IssueCriteria issueCriteria) {CriteriaBuilder builder = getSession().getCriteriaBuilder();CriteriaQuery<Long> criteriaQuery = builder.createQuery(Long.class);Root<Issue> root = criteriaQuery.from(Issue.class);-- if (issueCriteria != null)- criteriaQuery.where(issueCriteria.getPredicate(new QueryBuildContext(root, builder)));++ QueryBuildContext context = new QueryBuildContext(root, builder);+ criteriaQuery.where(getPredicates(issueCriteria, project, context));+criteriaQuery.select(builder.count(root));return getSession().createQuery(criteriaQuery).uniqueResult().intValue();}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.javanew file mode 100644index 0000000000..502770572d--- /dev/null+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultMilestoneManager.java@@ -0,0 +1,200 @@+package io.onedev.server.manager.impl;++import java.util.ArrayList;+import java.util.Date;+import java.util.List;++import javax.annotation.Nullable;+import javax.inject.Inject;+import javax.inject.Singleton;++import org.hibernate.criterion.Restrictions;+import org.hibernate.query.Query;++import com.google.common.base.Preconditions;++import io.onedev.launcher.loader.Listen;+import io.onedev.server.event.issue.IssueChanged;+import io.onedev.server.event.issue.IssueOpened;+import io.onedev.server.manager.IssueManager;+import io.onedev.server.manager.MilestoneManager;+import io.onedev.server.model.Issue;+import io.onedev.server.model.Milestone;+import io.onedev.server.model.Project;+import io.onedev.server.model.support.issue.changedata.MilestoneChangeData;+import io.onedev.server.model.support.issue.changedata.StateChangeData;+import io.onedev.server.model.support.issue.query.IssueCriteria;+import io.onedev.server.model.support.issue.workflow.StateSpec;+import io.onedev.server.persistence.annotation.Sessional;+import io.onedev.server.persistence.annotation.Transactional;+import io.onedev.server.persistence.dao.AbstractEntityManager;+import io.onedev.server.persistence.dao.Dao;+import io.onedev.server.persistence.dao.EntityCriteria;+import io.onedev.server.persistence.dao.EntityRemoved;+import io.onedev.utils.StringUtils;++@Singleton+public class DefaultMilestoneManager extends AbstractEntityManager<Milestone> implements MilestoneManager {++ private final IssueManager issueManager;++ @Inject+ public DefaultMilestoneManager(Dao dao, IssueManager issueManager) {+ super(dao);+ this.issueManager = issueManager;+ }++ @Transactional+ @Override+ public void delete(Milestone milestone, @Nullable Milestone moveIssuesToMilestone) {+ if (moveIssuesToMilestone != null) {+ Query<?> query = getSession().createQuery("update Issue set milestone=:newMilestone where milestone=:milestone");+ query.setParameter("milestone", milestone);+ query.setParameter("newMilestone", moveIssuesToMilestone);+ query.executeUpdate();+ moveIssuesToMilestone.setNumOfClosedIssues(milestone.getNumOfClosedIssues()+moveIssuesToMilestone.getNumOfClosedIssues());+ moveIssuesToMilestone.setNumOfOpenIssues(milestone.getNumOfOpenIssues()+moveIssuesToMilestone.getNumOfOpenIssues());+ save(moveIssuesToMilestone);+ } else {+ Query<?> query = getSession().createQuery("update Issue set milestone=null where milestone=:milestone");+ query.setParameter("milestone", milestone);+ query.executeUpdate();+ }+ super.delete(milestone);+ }++ @Override+ public void updateIssueCount(Milestone milestone, boolean closed) {+ IssueCriteria criteria = milestone.getProject().getIssueWorkflow().getStatesCriteria(closed);+ if (criteria != null) {+ if (closed)+ milestone.setNumOfClosedIssues(issueManager.count(milestone.getProject(), criteria));+ else+ milestone.setNumOfOpenIssues(issueManager.count(milestone.getProject(), criteria));+ } else {+ if (closed)+ milestone.setNumOfClosedIssues(0);+ else+ milestone.setNumOfOpenIssues(0);+ }+ save(milestone);+ }++ @Sessional+ @Override+ public Milestone find(Project project, String name) {+ EntityCriteria<Milestone> criteria = EntityCriteria.of(Milestone.class);+ criteria.add(Restrictions.eq("project", project));+ criteria.add(Restrictions.eq("name", name));+ return find(criteria);+ }++ @Transactional+ @Override+ public void close(Milestone milestone, @Nullable Milestone moveOpenIssuesToMilestone) {+ List<String> criterias = new ArrayList<>();+ for (StateSpec state: milestone.getProject().getIssueWorkflow().getStateSpecs()) {+ if (!state.isClosed())+ criterias.add("state='" + state.getName() + "'");+ }+ if (!criterias.isEmpty()) {+ String stateClause = "(" + StringUtils.join(criterias, " or ") + ")";+ if (moveOpenIssuesToMilestone != null) {+ Query<?> query = getSession().createQuery("update Issue set milestone=:newMilestone where milestone=:milestone and " + stateClause);+ query.setParameter("milestone", milestone);+ query.setParameter("newMilestone", moveOpenIssuesToMilestone);+ query.executeUpdate();+ moveOpenIssuesToMilestone.setNumOfOpenIssues(moveOpenIssuesToMilestone.getNumOfOpenIssues()+milestone.getNumOfOpenIssues());+ milestone.setNumOfOpenIssues(0);+ save(moveOpenIssuesToMilestone);+ } else {+ Query<?> query = getSession().createQuery("update Issue set milestone=null where milestone=:milestone and " + stateClause);+ query.setParameter("milestone", milestone);+ query.executeUpdate();+ milestone.setNumOfOpenIssues(0);+ }+ }+ milestone.setUpdateDate(new Date());+ milestone.setClosed(true);+ save(milestone);+ }++ @Transactional+ @Listen+ public void on(IssueOpened event) {+ Issue issue = event.getIssue();+ Milestone milestone = issue.getMilestone();+ if (milestone != null) {+ StateSpec state = issue.getProject().getIssueWorkflow().getStateSpec(issue.getState());+ Preconditions.checkNotNull(state);+ if (state.isClosed())+ milestone.setNumOfClosedIssues(milestone.getNumOfClosedIssues()+1);+ else+ milestone.setNumOfOpenIssues(milestone.getNumOfOpenIssues()+1);+ save(milestone);+ }+ }++ @Transactional+ @Listen+ public void on(EntityRemoved event) {+ if (event.getEntity() instanceof Issue) {+ Issue issue = (Issue) event.getEntity();+ Milestone milestone = issue.getMilestone();+ if (milestone != null) {+ StateSpec state = issue.getProject().getIssueWorkflow().getStateSpec(issue.getState());+ Preconditions.checkNotNull(state);+ if (state.isClosed())+ milestone.setNumOfClosedIssues(milestone.getNumOfClosedIssues()-1);+ else+ milestone.setNumOfOpenIssues(milestone.getNumOfOpenIssues()-1);+ save(milestone);+ }+ }+ }++ @Transactional+ @Listen+ public void on(IssueChanged event) {+ Issue issue = event.getIssue();+ Milestone milestone = issue.getMilestone();+ if (milestone != null && event.getChange().getData() instanceof StateChangeData) {+ StateChangeData data = (StateChangeData) event.getChange().getData();+ StateSpec prevState = issue.getProject().getIssueWorkflow().getStateSpec(data.getPrevState());+ Preconditions.checkNotNull(prevState);+ StateSpec state = issue.getProject().getIssueWorkflow().getStateSpec(data.getState());+ Preconditions.checkNotNull(prevState);+ if (prevState.isClosed() != state.isClosed()) {+ if (prevState.isClosed()) {+ milestone.setNumOfClosedIssues(milestone.getNumOfClosedIssues()-1);+ milestone.setNumOfOpenIssues(milestone.getNumOfOpenIssues()+1);+ } else {+ milestone.setNumOfClosedIssues(milestone.getNumOfClosedIssues()+1);+ milestone.setNumOfOpenIssues(milestone.getNumOfOpenIssues()-1);+ }+ save(milestone);+ }+ } else if (event.getChange().getData() instanceof MilestoneChangeData) {+ MilestoneChangeData data = (MilestoneChangeData) event.getChange().getData();+ Milestone oldMilestone = issue.getProject().getMilestone(data.getOldMilestone());+ Milestone newMilestone = issue.getProject().getMilestone(data.getNewMilestone());+ StateSpec state = issue.getProject().getIssueWorkflow().getStateSpec(issue.getState());+ Preconditions.checkNotNull(state);+ if (state.isClosed()) {+ if (oldMilestone != null)+ oldMilestone.setNumOfClosedIssues(oldMilestone.getNumOfClosedIssues()-1);+ if (newMilestone != null)+ newMilestone.setNumOfClosedIssues(newMilestone.getNumOfClosedIssues()+1);+ } else {+ if (oldMilestone != null)+ oldMilestone.setNumOfOpenIssues(oldMilestone.getNumOfOpenIssues()-1);+ if (newMilestone != null)+ newMilestone.setNumOfOpenIssues(newMilestone.getNumOfOpenIssues()+1);+ }+ if (oldMilestone != null)+ save(oldMilestone);+ if (newMilestone != null)+ save(newMilestone);+ }+ }+}diff --git a/core/src/main/java/io/onedev/server/model/Issue.java b/core/src/main/java/io/onedev/server/model/Issue.javaindex f857fa6ebd..c99e60e9a4 100644--- a/core/src/main/java/io/onedev/server/model/Issue.java+++ b/core/src/main/java/io/onedev/server/model/Issue.java@@ -79,6 +79,8 @@ public class Issue extends AbstractEntity implements Referenceable {public static final String UPDATE_DATE = "Update Date";+ public static final String MILESTONE = "Milestone";+static {BUILTIN_FIELDS.put(NUMBER, "number");BUILTIN_FIELDS.put(STATE, "state");@@ -89,6 +91,7 @@ public class Issue extends AbstractEntity implements Referenceable {BUILTIN_FIELDS.put(UPDATE_DATE, "lastActivity.date");BUILTIN_FIELDS.put(VOTES, "numOfVotes");BUILTIN_FIELDS.put(COMMENTS, "numOfComments");+ BUILTIN_FIELDS.put(MILESTONE, "milestone");}@Version@@ -108,6 +111,9 @@ public class Issue extends AbstractEntity implements Referenceable {@JoinColumn(nullable=false)private Project project;+ @ManyToOne(fetch=FetchType.LAZY)+ private Milestone milestone;+@ManyToOne(fetch=FetchType.LAZY)private User submitter;@@ -133,6 +139,8 @@ public class Issue extends AbstractEntity implements Referenceable {@Column(nullable=false)private String noSpaceTitle;+ private int boardPosition;+@Embeddedprivate LastActivity lastActivity;@@ -143,7 +151,7 @@ public class Issue extends AbstractEntity implements Referenceable {private Collection<IssueComment> comments = new ArrayList<>();@OneToMany(mappedBy="issue", cascade=CascadeType.REMOVE)- private Collection<IssueChange> edits = new ArrayList<>();+ private Collection<IssueChange> changes = new ArrayList<>();@OneToMany(mappedBy="issue", cascade=CascadeType.REMOVE)private Collection<IssueVote> votes = new ArrayList<>();@@ -237,6 +245,14 @@ public class Issue extends AbstractEntity implements Referenceable {this.submitDate = submitDate.getTime();}+ public Milestone getMilestone() {+ return milestone;+ }++ public void setMilestone(Milestone milestone) {+ this.milestone = milestone;+ }+public Collection<IssueComment> getComments() {return comments;}@@ -245,12 +261,12 @@ public class Issue extends AbstractEntity implements Referenceable {this.comments = comments;}- public Collection<IssueChange> getEdits() {- return edits;+ public Collection<IssueChange> getChanges() {+ return changes;}- public void setEdits(Collection<IssueChange> edits) {- this.edits = edits;+ public void setChanges(Collection<IssueChange> changes) {+ this.changes = changes;}public Collection<IssueVote> getVotes() {@@ -285,6 +301,14 @@ public class Issue extends AbstractEntity implements Referenceable {this.numOfComments = numOfComments;}+ public int getBoardPosition() {+ return boardPosition;+ }++ public void setBoardPosition(int boardPosition) {+ this.boardPosition = boardPosition;+ }+public Collection<IssueFieldUnary> getFieldUnaries() {return fieldUnaries;}@@ -371,4 +395,10 @@ public class Issue extends AbstractEntity implements Referenceable {}return promptedFields;}++ @Nullable+ public String getMilestoneName() {+ return getMilestone()!=null? getMilestone().getName():null;+ }+}diff --git a/core/src/main/java/io/onedev/server/model/IssueBoard.java b/core/src/main/java/io/onedev/server/model/IssueBoard.javanew file mode 100644index 0000000000..5134585463--- /dev/null+++ b/core/src/main/java/io/onedev/server/model/IssueBoard.java@@ -0,0 +1,90 @@+package io.onedev.server.model;++import java.util.ArrayList;++import javax.persistence.Column;+import javax.persistence.Entity;+import javax.persistence.FetchType;+import javax.persistence.Index;+import javax.persistence.JoinColumn;+import javax.persistence.Lob;+import javax.persistence.ManyToOne;+import javax.persistence.Table;+import javax.persistence.UniqueConstraint;++@Entity+@Table(+ indexes={@Index(columnList="g_project_id"), @Index(columnList="g_milestone_id"), @Index(columnList="name")},+ uniqueConstraints={@UniqueConstraint(columnNames={"g_project_id", "name"})}+)+public class IssueBoard extends AbstractEntity {++ private static final long serialVersionUID = 1L;++ @ManyToOne(fetch=FetchType.LAZY)+ @JoinColumn(nullable=false)+ private Project project;++ @ManyToOne(fetch=FetchType.LAZY)+ private Milestone milestone;++ @Column(nullable=false)+ private String name;++ private String query;++ @Column(nullable=false)+ private String columnField;++ @Lob+ private ArrayList<String> columns = new ArrayList<>();++ public Project getProject() {+ return project;+ }++ public void setProject(Project project) {+ this.project = project;+ }++ public Milestone getMilestone() {+ return milestone;+ }++ public void setMilestone(Milestone milestone) {+ this.milestone = milestone;+ }++ public String getName() {+ return name;+ }++ public void setName(String name) {+ this.name = name;+ }++ public String getQuery() {+ return query;+ }++ public void setQuery(String query) {+ this.query = query;+ }++ public String getColumnField() {+ return columnField;+ }++ public void setColumnField(String columnField) {+ this.columnField = columnField;+ }++ public ArrayList<String> getColumns() {+ return columns;+ }++ public void setColumns(ArrayList<String> columns) {+ this.columns = columns;+ }++}diff --git a/core/src/main/java/io/onedev/server/model/Milestone.java b/core/src/main/java/io/onedev/server/model/Milestone.javanew file mode 100644index 0000000000..3beb46a242--- /dev/null+++ b/core/src/main/java/io/onedev/server/model/Milestone.java@@ -0,0 +1,133 @@+package io.onedev.server.model;++import java.util.ArrayList;+import java.util.Collection;+import java.util.Date;++import javax.persistence.Entity;+import javax.persistence.Index;+import javax.persistence.JoinColumn;+import javax.persistence.ManyToOne;+import javax.persistence.OneToMany;+import javax.persistence.Table;+import javax.persistence.UniqueConstraint;++import org.hibernate.annotations.Cache;+import org.hibernate.annotations.CacheConcurrencyStrategy;+import org.hibernate.validator.constraints.NotEmpty;++import io.onedev.server.web.editable.annotation.Editable;+import io.onedev.server.web.editable.annotation.Multiline;++@Entity+@Table(+ indexes={@Index(columnList="g_project_id")},+ uniqueConstraints={@UniqueConstraint(columnNames={"g_project_id", "name"})}+)+@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)+@Editable+public class Milestone extends AbstractEntity {++ private static final long serialVersionUID = 1L;++ public static final String NAME = "name";++ @ManyToOne+ @JoinColumn(nullable=false)+ private Project project;++ private String name;++ private String description;++ private Date dueDate;++ private Date updateDate;++ private int numOfOpenIssues;++ private int numOfClosedIssues;++ private boolean closed;++ @OneToMany(mappedBy="milestone")+ private Collection<Issue> issues = new ArrayList<>();++ public Project getProject() {+ return project;+ }++ public void setProject(Project project) {+ this.project = project;+ }++ @Editable(order=100)+ @NotEmpty+ public String getName() {+ return name;+ }++ public void setName(String name) {+ this.name = name;+ }++ @Editable(order=200)+ @Multiline+ public String getDescription() {+ return description;+ }++ public void setDescription(String description) {+ this.description = description;+ }++ @Editable(order=300)+ public Date getDueDate() {+ return dueDate;+ }++ public void setDueDate(Date dueDate) {+ this.dueDate = dueDate;+ }++ public Date getUpdateDate() {+ return updateDate;+ }++ public void setUpdateDate(Date updateDate) {+ this.updateDate = updateDate;+ }++ public boolean isClosed() {+ return closed;+ }++ public void setClosed(boolean closed) {+ this.closed = closed;+ }++ public int getNumOfOpenIssues() {+ return numOfOpenIssues;+ }++ public void setNumOfOpenIssues(int numOfOpenIssues) {+ this.numOfOpenIssues = numOfOpenIssues;+ }++ public int getNumOfClosedIssues() {+ return numOfClosedIssues;+ }++ public void setNumOfClosedIssues(int numOfClosedIssues) {+ this.numOfClosedIssues = numOfClosedIssues;+ }++ public Collection<Issue> getIssues() {+ return issues;+ }++ public void setIssues(Collection<Issue> issues) {+ this.issues = issues;+ }++}diff --git a/core/src/main/java/io/onedev/server/model/Project.java b/core/src/main/java/io/onedev/server/model/Project.javaindex d47d0560de..8a1ea8031e 100644--- a/core/src/main/java/io/onedev/server/model/Project.java+++ b/core/src/main/java/io/onedev/server/model/Project.java@@ -176,6 +176,9 @@ public class Project extends AbstractEntity {@OneToMany(mappedBy="project", cascade=CascadeType.REMOVE)private Collection<Task> tasks = new ArrayList<>();+ @OneToMany(mappedBy="project", cascade=CascadeType.REMOVE)+ private Collection<Milestone> milestones = new ArrayList<>();+@Lob@Column(nullable=false, length=65535)private IssueWorkflow issueWorkflow = new IssueWorkflow();@@ -915,6 +918,14 @@ public class Project extends AbstractEntity {}}+ public Collection<Milestone> getMilestones() {+ return milestones;+ }++ public void setMilestones(Collection<Milestone> milestones) {+ this.milestones = milestones;+ }+@Nullablepublic TagProtection getTagProtection(String tagName, User user) {for (TagProtection protection: tagProtections) {@@ -1004,4 +1015,13 @@ public class Project extends AbstractEntity {issueQuerySettingOfCurrentUser = Optional.fromNullable(setting);}+ @Nullable+ public Milestone getMilestone(@Nullable String milestoneName) {+ for (Milestone milestone: milestones) {+ if (milestone.getName().equals(milestoneName))+ return milestone;+ }+ return null;+ }+}diff --git a/core/src/main/java/io/onedev/server/model/support/issue/changedata/MilestoneChangeData.java b/core/src/main/java/io/onedev/server/model/support/issue/changedata/MilestoneChangeData.javanew file mode 100644index 0000000000..06171f1a74--- /dev/null+++ b/core/src/main/java/io/onedev/server/model/support/issue/changedata/MilestoneChangeData.java@@ -0,0 +1,93 @@+package io.onedev.server.model.support.issue.changedata;++import java.util.ArrayList;+import java.util.HashMap;+import java.util.List;+import java.util.Map;++import javax.annotation.Nullable;++import org.apache.wicket.Component;++import io.onedev.server.model.Group;+import io.onedev.server.model.Issue;+import io.onedev.server.model.IssueChange;+import io.onedev.server.model.User;+import io.onedev.server.util.diff.DiffUtils;+import io.onedev.server.web.component.diff.plain.PlainDiffPanel;+import io.onedev.utils.HtmlUtils;++public class MilestoneChangeData implements ChangeData {++ private static final long serialVersionUID = 1L;++ private final String oldMilestone;++ private final String newMilestone;++ public MilestoneChangeData(@Nullable String oldMilestone, @Nullable String newMilestone) {+ this.oldMilestone = oldMilestone;+ this.newMilestone = newMilestone;+ }++ @Override+ public Component render(String componentId, IssueChange change) {+ return new PlainDiffPanel(componentId, getOldLines(), getNewLines());+ }++ private List<String> getOldLines() {+ List<String> oldLines = new ArrayList<>();+ if (oldMilestone != null)+ oldLines.add(oldMilestone);+ return oldLines;+ }++ private List<String> getNewLines() {+ List<String> newLines = new ArrayList<>();+ if (newMilestone != null)+ newLines.add(newMilestone);+ return newLines;+ }++ public String getOldMilestone() {+ return oldMilestone;+ }++ public String getNewMilestone() {+ return newMilestone;+ }++ @Override+ public String getTitle(IssueChange change, boolean external) {+ Issue issue = change.getIssue();+ if (external)+ return String.format("[Milestone Changed] Issue #%d: %s", issue.getNumber(), issue.getTitle());+ else+ return "changed milestone";+ }++ @Override+ public String describeAsHtml(IssueChange change) {+ String escaped = HtmlUtils.escapeHtml(change.getUser().getDisplayName());+ StringBuilder builder = new StringBuilder(String.format("<b>%s changed milestone</b>", escaped));+ builder.append("<p style='margin: 16px 0;'>");+ builder.append(DiffUtils.diffAsHtml(getOldLines(), getNewLines()));+ return builder.toString();+ }++ @Override+ public String getComment() {+ return null;+ }++ @Override+ public Map<String, User> getNewUsers() {+ return new HashMap<>();+ }++ @Override+ public Map<String, Group> getNewGroups() {+ return new HashMap<>();+ }++}diff --git a/core/src/main/java/io/onedev/server/model/support/issue/changedata/StateChangeData.java b/core/src/main/java/io/onedev/server/model/support/issue/changedata/StateChangeData.javaindex 2351e0f36a..46c4fad043 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/changedata/StateChangeData.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/changedata/StateChangeData.java@@ -19,14 +19,17 @@ public class StateChangeData extends FieldChangeData {private static final long serialVersionUID = 1L;+ private final String prevState;+private final String state;private String comment;- public StateChangeData(String state, Map<String, IssueField> oldFields, Map<String, IssueField> newFields,+ public StateChangeData(String state, String prevState, Map<String, IssueField> oldFields, Map<String, IssueField> newFields,@Nullable String comment) {super(oldFields, newFields);this.state = state;+ this.prevState = prevState;this.comment = comment;}@@ -34,6 +37,10 @@ public class StateChangeData extends FieldChangeData {return state;}+ public String getPrevState() {+ return prevState;+ }+@Overridepublic String getComment() {return comment;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 7b430771d0..014c16166b 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@@ -1,5 +1,6 @@package io.onedev.server.model.support.issue.query;+import java.io.Serializable;import java.util.ArrayList;import java.util.Collection;import java.util.HashMap;@@ -127,5 +128,11 @@ public class AndCriteria extends IssueCriteria {}return criterias.isEmpty();}++ @Override+ public void populate(Issue issue, Serializable fieldBean, Set<String> initedLists) {+ for (IssueCriteria criteria: criterias)+ criteria.populate(issue, fieldBean, initedLists);+ }}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 b9b66553d7..f3fb91cf40 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@@ -1,6 +1,8 @@package io.onedev.server.model.support.issue.query;+import java.io.Serializable;import java.util.Objects;+import java.util.Set;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;@@ -46,7 +48,13 @@ public class BooleanFieldCriteria extends FieldCriteria {@Overridepublic String toString() {- return quote(getFieldName()) + " " + IssueQuery.getOperatorName(operator) + " " + quote(String.valueOf(value));+ return IssueQuery.quote(getFieldName()) + " " + IssueQuery.getOperatorName(operator) + " " + IssueQuery.quote(String.valueOf(value));+ }++ @Override+ public void populate(Issue issue, Serializable fieldBean, Set<String> initedLists) {+ if (operator == IssueQueryLexer.Is)+ setFieldValue(fieldBean, value);}}diff --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 46ebfb2746..0e6df2d98d 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@@ -1,10 +1,12 @@package io.onedev.server.model.support.issue.query;+import java.io.Serializable;import java.util.ArrayList;import java.util.HashMap;import java.util.List;import java.util.Map;import java.util.Objects;+import java.util.Set;import javax.persistence.criteria.Join;import javax.persistence.criteria.Predicate;@@ -84,7 +86,7 @@ public class ChoiceFieldCriteria extends FieldCriteria {@Overridepublic String toString() {- return quote(getFieldName()) + " " + IssueQuery.getOperatorName(operator) + " " + quote(value);+ return IssueQuery.quote(getFieldName()) + " " + IssueQuery.getOperatorName(operator) + " " + IssueQuery.quote(value);}@Override@@ -108,4 +110,28 @@ public class ChoiceFieldCriteria extends FieldCriteria {return fieldName.equals(getFieldName()) && fieldValue.equals(value);}+ @SuppressWarnings({ "rawtypes", "unchecked" })+ @Override+ public void populate(Issue issue, Serializable fieldBean, Set<String> initedLists) {+ if (allowMultiple) {+ if (operator == IssueQueryLexer.Contains) {+ List list;+ if (!initedLists.contains(getFieldName())) {+ list = new ArrayList();+ setFieldValue(fieldBean, list);+ initedLists.add(getFieldName());+ } else {+ list = (List) getFieldValue(fieldBean);+ if (list == null) {+ list = new ArrayList();+ setFieldValue(fieldBean, list);+ }+ }+ list.add(value);+ }+ } else if (operator == IssueQueryLexer.Is) {+ setFieldValue(fieldBean, value);+ }+ }+}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 b272fcc1c5..1303351816 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@@ -50,7 +50,7 @@ public class CommentsCriteria extends IssueCriteria {@Overridepublic String toString() {- return quote(Issue.COMMENTS) + " " + IssueQuery.getOperatorName(operator) + " " + quote(String.valueOf(value));+ return IssueQuery.quote(Issue.COMMENTS) + " " + IssueQuery.getOperatorName(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 bb611dbd8b..1f17d9619f 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@@ -50,7 +50,7 @@ public class DateFieldCriteria extends FieldCriteria {@Overridepublic String toString() {- return quote(getFieldName()) + " " + IssueQuery.getOperatorName(operator) + " " + quote(rawValue);+ return IssueQuery.quote(getFieldName()) + " " + IssueQuery.getOperatorName(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 1c518ace03..676fb3855e 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@@ -42,7 +42,7 @@ public class DescriptionCriteria extends IssueCriteria {@Overridepublic String toString() {- return quote(Issue.DESCRIPTION) + " " + IssueQuery.getOperatorName(operator) + " " + quote(value);+ return IssueQuery.quote(Issue.DESCRIPTION) + " " + IssueQuery.getOperatorName(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.javanew file mode 100644index 0000000000..7bd4c9772d--- /dev/null+++ b/core/src/main/java/io/onedev/server/model/support/issue/query/DescriptionUnaryCriteria.java@@ -0,0 +1,45 @@+package io.onedev.server.model.support.issue.query;++import javax.persistence.criteria.Path;+import javax.persistence.criteria.Predicate;++import io.onedev.server.model.Issue;++public class DescriptionUnaryCriteria extends IssueCriteria {++ private static final long serialVersionUID = 1L;++ private final int operator;++ public DescriptionUnaryCriteria(int operator) {+ this.operator = operator;+ }++ @Override+ public Predicate getPredicate(QueryBuildContext context) {+ Path<?> attribute = context.getRoot().get(Issue.BUILTIN_FIELDS.get(Issue.DESCRIPTION));+ if (operator == IssueQueryLexer.IsEmpty)+ return context.getBuilder().isNull(attribute);+ else+ return context.getBuilder().isNotNull(attribute);+ }++ @Override+ public boolean matches(Issue issue) {+ if (operator == IssueQueryLexer.IsEmpty)+ return issue.getDescription() == null;+ else+ return issue.getDescription() != null;+ }++ @Override+ public boolean needsLogin() {+ return true;+ }++ @Override+ public String toString() {+ return IssueQuery.quote(Issue.DESCRIPTION) + " " + IssueQuery.getOperatorName(operator);+ }++}diff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/FieldCriteria.java b/core/src/main/java/io/onedev/server/model/support/issue/query/FieldCriteria.javaindex 80e34ac5e5..e8726f953e 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/query/FieldCriteria.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/query/FieldCriteria.java@@ -1,5 +1,6 @@package io.onedev.server.model.support.issue.query;+import java.io.Serializable;import java.util.ArrayList;import java.util.Collection;import java.util.HashSet;@@ -13,6 +14,8 @@ import io.onedev.server.util.EditContext;import io.onedev.server.util.OneContext;import io.onedev.server.util.inputspec.InputContext;import io.onedev.server.util.inputspec.InputSpec;+import io.onedev.server.web.editable.BeanDescriptor;+import io.onedev.server.web.editable.PropertyDescriptor;public abstract class FieldCriteria extends IssueCriteria {@@ -103,4 +106,16 @@ public abstract class FieldCriteria extends IssueCriteria {return fieldName.equals(this.fieldName);}+ protected Object getFieldValue(Serializable fieldBean) {+ PropertyDescriptor propertyDescriptor = new BeanDescriptor(fieldBean.getClass())+ .getMapOfDisplayNameToPropertyDescriptor().get(fieldName);+ return propertyDescriptor.getPropertyValue(fieldBean);+ }++ protected void setFieldValue(Serializable fieldBean, Object value) {+ PropertyDescriptor propertyDescriptor = new BeanDescriptor(fieldBean.getClass())+ .getMapOfDisplayNameToPropertyDescriptor().get(fieldName);+ propertyDescriptor.setPropertyValue(fieldBean, value);+ }+}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 2d8d46d065..27ad0ec43d 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@@ -1,6 +1,8 @@package io.onedev.server.model.support.issue.query;+import java.io.Serializable;import java.util.Objects;+import java.util.Set;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;@@ -53,7 +55,13 @@ public class FieldUnaryCriteria extends FieldCriteria {@Overridepublic String toString() {- return quote(getFieldName()) + " " + IssueQuery.getOperatorName(operator);+ return IssueQuery.quote(getFieldName()) + " " + IssueQuery.getOperatorName(operator);+ }++ @Override+ public void populate(Issue issue, Serializable fieldBean, Set<String> initedLists) {+ if (operator == IssueQueryLexer.IsEmpty)+ setFieldValue(fieldBean, null);}}diff --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 781c4d54ee..f147e2d9ad 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@@ -5,13 +5,12 @@ import java.util.Collection;import java.util.HashMap;import java.util.HashSet;import java.util.Map;+import java.util.Set;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;-import org.unbescape.java.JavaEscape;-import com.google.common.base.Splitter;import io.onedev.server.model.Issue;@@ -35,16 +34,19 @@ public abstract class IssueCriteria implements Serializable {}}+ public final void populate(Issue issue, Serializable fieldBean) {+ populate(issue, fieldBean, new HashSet<>());+ }++ public void populate(Issue issue, Serializable fieldBean, Set<String> initedLists) {+ }+public abstract boolean matches(Issue issue);public abstract boolean needsLogin();public abstract String toString();- protected String quote(String value) {- return "\"" + JavaEscape.escapeJava(value) + "\"";- }-public Collection<String> getUndefinedStates(Project project) {return new HashSet<>();}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 ca9b5d664c..b1aafeb4f6 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@@ -47,7 +47,7 @@ public class IssueFieldCriteria extends FieldCriteria {@Overridepublic String toString() {- return quote(getFieldName()) + " " + IssueQuery.getOperatorName(operator) + " " + quote(String.valueOf(value));+ return IssueQuery.quote(getFieldName()) + " " + IssueQuery.getOperatorName(operator) + " " + IssueQuery.quote(String.valueOf(value));}}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 dcdd3f2c92..462d86b453 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@@ -12,13 +12,6 @@ import java.util.Map;import java.util.Set;import javax.annotation.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.Join;-import javax.persistence.criteria.JoinType;-import javax.persistence.criteria.Order;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Root;import org.antlr.v4.runtime.ANTLRInputStream;import org.antlr.v4.runtime.BailErrorStrategy;@@ -26,7 +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.hibernate.Session;import org.slf4j.Logger;import org.slf4j.LoggerFactory;import org.unbescape.java.JavaEscape;@@ -35,7 +27,6 @@ import io.onedev.server.OneDev;import io.onedev.server.exception.OneException;import io.onedev.server.manager.UserManager;import io.onedev.server.model.Issue;-import io.onedev.server.model.IssueFieldUnary;import io.onedev.server.model.Project;import io.onedev.server.model.User;import io.onedev.server.model.support.issue.query.IssueQueryParser.AndCriteriaContext;@@ -83,39 +74,6 @@ public class IssueQuery implements Serializable {this(null, new ArrayList<>());}- public CriteriaQuery<Issue> buildCriteriaQuery(Session session) {- CriteriaBuilder builder = session.getCriteriaBuilder();- CriteriaQuery<Issue> query = builder.createQuery(Issue.class);- Root<Issue> root = query.from(Issue.class);-- if (criteria != null)- query.where(criteria.getPredicate(new QueryBuildContext(root, builder)));-- List<Order> orders = new ArrayList<>();- for (IssueSort sort: sorts) {- if (Issue.BUILTIN_FIELDS.containsKey(sort.getField())) {- if (sort.getDirection() == Direction.ASCENDING)- orders.add(builder.asc(root.get(Issue.BUILTIN_FIELDS.get(sort.getField()))));- else- orders.add(builder.desc(root.get(Issue.BUILTIN_FIELDS.get(sort.getField()))));- } else {- Join<Issue, IssueFieldUnary> join = root.join("fieldUnaries", JoinType.LEFT);- join.on(builder.equal(join.get(IssueFieldUnary.NAME), sort.getField()));- if (sort.getDirection() == Direction.ASCENDING)- orders.add(builder.asc(join.get(IssueFieldUnary.ORDINAL)));- else- orders.add(builder.desc(join.get(IssueFieldUnary.ORDINAL)));- }- }-- Path<String> idPath = root.get("id");- if (orders.isEmpty())- orders.add(builder.desc(idPath));- query.orderBy(orders);-- return query;- }-@Nullablepublic IssueCriteria getCriteria() {return criteria;@@ -234,7 +192,11 @@ public class IssueQuery implements Serializable {int operator = ctx.operator.getType();if (validate)checkField(project, fieldName, operator);- if (fieldName.equals(Issue.SUBMITTER))+ if (fieldName.equals(Issue.MILESTONE))+ return new MilestoneUnaryCriteria(operator);+ else if (fieldName.equals(Issue.DESCRIPTION))+ return new DescriptionUnaryCriteria(operator);+ else if (fieldName.equals(Issue.SUBMITTER))return new SubmitterUnaryCriteria(operator);elsereturn new FieldUnaryCriteria(fieldName, operator);@@ -286,7 +248,9 @@ public class IssueQuery implements Serializable {}case IssueQueryLexer.Is:case IssueQueryLexer.IsNot:- if (fieldName.equals(Issue.STATE)) {+ if (fieldName.equals(Issue.MILESTONE)) {+ return new MilestoneCriteria(value, operator);+ } else if (fieldName.equals(Issue.STATE)) {return new StateCriteria(value, operator);} else if (fieldName.equals(Issue.VOTES)) {return new VotesCriteria(getIntValue(value), operator);@@ -409,8 +373,10 @@ public class IssueQuery implements Serializable {switch (operator) {case IssueQueryLexer.IsEmpty:case IssueQueryLexer.IsNotEmpty:- if (Issue.BUILTIN_FIELDS.containsKey(fieldName))+ if (Issue.BUILTIN_FIELDS.containsKey(fieldName) && !fieldName.equals(Issue.DESCRIPTION)+ && !fieldName.equals(Issue.MILESTONE)) {throw newOperatorException(fieldName, operator);+ }break;case IssueQueryLexer.IsMe:case IssueQueryLexer.IsNotMe:@@ -438,6 +404,7 @@ public class IssueQuery implements Serializable {&& !fieldName.equals(Issue.COMMENTS)&& !fieldName.equals(Issue.SUBMITTER)&& !fieldName.equals(Issue.NUMBER)+ && !fieldName.equals(Issue.MILESTONE)&& !(fieldSpec instanceof IssueChoiceInput)&& !(fieldSpec instanceof BooleanInput)&& !(fieldSpec instanceof NumberInput)@@ -556,4 +523,8 @@ public class IssueQuery implements Serializable {return criteria != null && criteria.onDeleteFieldValue(fieldName, fieldValue);}+ public static String quote(String value) {+ return "\"" + JavaEscape.escapeJava(value) + "\"";+ }+}diff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/IssueSort.java b/core/src/main/java/io/onedev/server/model/support/issue/query/IssueSort.javaindex ced0b2cedd..aa2d483193 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/query/IssueSort.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/query/IssueSort.java@@ -7,7 +7,6 @@ import java.util.List;import javax.validation.constraints.NotNull;import org.hibernate.validator.constraints.NotEmpty;-import org.unbescape.java.JavaEscape;import io.onedev.server.util.inputspec.InputSpec;import io.onedev.server.util.inputspec.choiceinput.ChoiceInput;@@ -65,9 +64,9 @@ public class IssueSort implements Serializable {@Overridepublic String toString() {if (direction == Direction.ASCENDING)- return "\"" + JavaEscape.escapeJava(field) + "\"" + " asc";+ return IssueQuery.quote(field) + " asc";else- return "\"" + JavaEscape.escapeJava(field) + "\"" + " desc";+ return IssueQuery.quote(field) + " desc";}}\ No newline at end of filediff --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.javanew file mode 100644index 0000000000..0624178ffe--- /dev/null+++ b/core/src/main/java/io/onedev/server/model/support/issue/query/MilestoneCriteria.java@@ -0,0 +1,66 @@+package io.onedev.server.model.support.issue.query;++import java.io.Serializable;+import java.util.Set;++import javax.persistence.criteria.Path;+import javax.persistence.criteria.Predicate;++import io.onedev.server.model.Issue;+import io.onedev.server.model.Milestone;++public class MilestoneCriteria extends IssueCriteria {++ private static final long serialVersionUID = 1L;++ private final int operator;++ private final String value;++ public MilestoneCriteria(String value, int operator) {+ this.operator = operator;+ this.value = value;+ }++ public int getOperator() {+ return operator;+ }++ public String getValue() {+ return value;+ }++ @Override+ public Predicate getPredicate(QueryBuildContext context) {+ Path<?> attribute = context.getJoin(Issue.MILESTONE).get(Milestone.NAME);+ if (operator == IssueQueryLexer.Is)+ return context.getBuilder().equal(attribute, value);+ else+ return context.getBuilder().notEqual(attribute, value);+ }++ @Override+ public boolean matches(Issue issue) {+ if (operator == IssueQueryLexer.Is)+ return issue.getMilestone() != null && issue.getMilestone().getName().equals(value);+ else+ return issue.getMilestone() == null || !issue.getMilestone().getName().equals(value);+ }++ @Override+ public boolean needsLogin() {+ return operator == IssueQueryLexer.IsMe || operator == IssueQueryLexer.IsNotMe;+ }++ @Override+ public String toString() {+ return IssueQuery.quote(Issue.MILESTONE) + " " + IssueQuery.getOperatorName(operator);+ }++ @Override+ public void populate(Issue issue, Serializable fieldBean, Set<String> initedLists) {+ if (operator == IssueQueryLexer.Is)+ issue.setMilestone(issue.getProject().getMilestone(value));+ }++}diff --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.javanew file mode 100644index 0000000000..3f80e548cb--- /dev/null+++ b/core/src/main/java/io/onedev/server/model/support/issue/query/MilestoneUnaryCriteria.java@@ -0,0 +1,46 @@+package io.onedev.server.model.support.issue.query;++import javax.persistence.criteria.Path;+import javax.persistence.criteria.Predicate;++import io.onedev.server.model.Issue;+import io.onedev.server.model.Milestone;++public class MilestoneUnaryCriteria extends IssueCriteria {++ private static final long serialVersionUID = 1L;++ private final int operator;++ public MilestoneUnaryCriteria(int operator) {+ this.operator = operator;+ }++ @Override+ public Predicate getPredicate(QueryBuildContext context) {+ Path<?> attribute = context.getJoin(Issue.MILESTONE).get(Milestone.NAME);+ if (operator == IssueQueryLexer.IsEmpty)+ return context.getBuilder().isNull(attribute);+ else+ return context.getBuilder().isNotNull(attribute);+ }++ @Override+ public boolean matches(Issue issue) {+ if (operator == IssueQueryLexer.IsEmpty)+ return issue.getMilestone() == null;+ else+ return issue.getMilestone() != null;+ }++ @Override+ public boolean needsLogin() {+ return operator == IssueQueryLexer.IsMe || operator == IssueQueryLexer.IsNotMe;+ }++ @Override+ public String toString() {+ return IssueQuery.quote(Issue.MILESTONE) + " " + IssueQuery.getOperatorName(operator);+ }++}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 cab530c55e..2c0d24d89d 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@@ -50,7 +50,7 @@ public class NumberCriteria extends IssueCriteria {@Overridepublic String toString() {- return quote(Issue.NUMBER) + " " + IssueQuery.getOperatorName(operator) + " " + quote(String.valueOf(value));+ return IssueQuery.quote(Issue.NUMBER) + " " + IssueQuery.getOperatorName(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 7a3e621df8..d01ba1d8b6 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@@ -1,6 +1,8 @@package io.onedev.server.model.support.issue.query;+import java.io.Serializable;import java.util.Objects;+import java.util.Set;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;@@ -55,7 +57,13 @@ public class NumberFieldCriteria extends FieldCriteria {@Overridepublic String toString() {- return quote(getFieldName()) + " " + IssueQuery.getOperatorName(operator) + " " + quote(String.valueOf(value));+ return IssueQuery.quote(getFieldName()) + " " + IssueQuery.getOperatorName(operator) + " " + IssueQuery.quote(String.valueOf(value));+ }++ @Override+ public void populate(Issue issue, Serializable fieldBean, Set<String> initedLists) {+ if (operator == IssueQueryLexer.Is)+ setFieldValue(fieldBean, value);}}diff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/QueryBuildContext.java b/core/src/main/java/io/onedev/server/model/support/issue/query/QueryBuildContext.javaindex 1d132912ba..a5d69435e1 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/query/QueryBuildContext.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/query/QueryBuildContext.java@@ -5,6 +5,7 @@ import java.util.Map;import javax.persistence.criteria.CriteriaBuilder;import javax.persistence.criteria.Join;+import javax.persistence.criteria.JoinType;import javax.persistence.criteria.Root;import io.onedev.server.model.Issue;@@ -25,9 +26,14 @@ public class QueryBuildContext {public Join<Issue, ?> getJoin(String fieldName) {Join<Issue, ?> join = joins.get(fieldName);if (join == null) {- join = root.join("fieldUnaries");- join.on(builder.equal(join.get("name"), fieldName));- joins.put(fieldName, join);+ if (fieldName.equals(Issue.MILESTONE)) {+ join = root.join("milestone", JoinType.LEFT);+ joins.put(fieldName, join);+ } else {+ join = root.join("fieldUnaries");+ join.on(builder.equal(join.get("name"), fieldName));+ joins.put(fieldName, join);+ }}return join;}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 5c3dad3c0f..12ed08c896 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@@ -47,7 +47,7 @@ public class StateCriteria extends IssueCriteria {@Overridepublic String toString() {- return quote(Issue.STATE) + " " + IssueQuery.getOperatorName(operator) + " " + quote(value);+ return IssueQuery.quote(Issue.STATE) + " " + IssueQuery.getOperatorName(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 83f04dcece..67078643ea 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@@ -1,6 +1,8 @@package io.onedev.server.model.support.issue.query;+import java.io.Serializable;import java.util.Objects;+import java.util.Set;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;@@ -59,7 +61,13 @@ public class StringFieldCriteria extends FieldCriteria {@Overridepublic String toString() {- return quote(getFieldName()) + " " + IssueQuery.getOperatorName(operator) + " " + quote(value);+ return IssueQuery.quote(getFieldName()) + " " + IssueQuery.getOperatorName(operator) + " " + IssueQuery.quote(value);}+ @Override+ public void populate(Issue issue, Serializable fieldBean, Set<String> initedLists) {+ if (operator == IssueQueryLexer.Is)+ setFieldValue(fieldBean, value);+ }+}diff --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 b226b9773e..537c35a535 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@@ -47,7 +47,7 @@ public class SubmitDateCriteria extends IssueCriteria {@Overridepublic String toString() {- return quote(Issue.SUBMIT_DATE) + " " + IssueQuery.getOperatorName(operator) + " " + quote(rawValue);+ return IssueQuery.quote(Issue.SUBMIT_DATE) + " " + IssueQuery.getOperatorName(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 1e6175bf5f..77d9196fb9 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@@ -45,7 +45,7 @@ public class SubmitterCriteria extends IssueCriteria {@Overridepublic String toString() {- return quote(Issue.SUBMITTER) + " " + IssueQuery.getOperatorName(operator) + " " + quote(value.getName());+ return IssueQuery.quote(Issue.SUBMITTER) + " " + IssueQuery.getOperatorName(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 c432977475..320633ee23 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@@ -42,7 +42,7 @@ public class SubmitterUnaryCriteria extends IssueCriteria {@Overridepublic String toString() {- return quote(Issue.SUBMITTER) + " " + IssueQuery.getOperatorName(operator);+ return IssueQuery.quote(Issue.SUBMITTER) + " " + IssueQuery.getOperatorName(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 b1792a53ef..7f9e76d9f0 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@@ -42,7 +42,7 @@ public class TitleCriteria extends IssueCriteria {@Overridepublic String toString() {- return quote(Issue.TITLE) + " " + IssueQuery.getOperatorName(operator) + " " + quote(value);+ return IssueQuery.quote(Issue.TITLE) + " " + IssueQuery.getOperatorName(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 eda35735bc..3648f86536 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@@ -47,7 +47,7 @@ public class UpdateDateCriteria extends IssueCriteria {@Overridepublic String toString() {- return quote(Issue.UPDATE_DATE) + " " + IssueQuery.getOperatorName(operator) + " " + quote(rawValue);+ return IssueQuery.quote(Issue.UPDATE_DATE) + " " + IssueQuery.getOperatorName(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 9f984097a8..01e7907fef 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@@ -50,7 +50,7 @@ public class VotesCriteria extends IssueCriteria {@Overridepublic String toString() {- return quote(Issue.VOTES) + " " + IssueQuery.getOperatorName(operator) + " " + quote(String.valueOf(value));+ return IssueQuery.quote(Issue.VOTES) + " " + IssueQuery.getOperatorName(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 be091d5c22..0849fd4ad9 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@@ -16,6 +16,10 @@ import com.google.common.collect.Lists;import io.onedev.server.exception.OneException;import io.onedev.server.model.support.authorized.ProjectWriters;+import io.onedev.server.model.support.issue.query.IssueCriteria;+import io.onedev.server.model.support.issue.query.IssueQueryLexer;+import io.onedev.server.model.support.issue.query.OrCriteria;+import io.onedev.server.model.support.issue.query.StateCriteria;import io.onedev.server.model.support.issue.workflow.action.PressButton;import io.onedev.server.util.inputspec.InputSpec;import io.onedev.server.util.inputspec.choiceinput.ChoiceInput;@@ -152,14 +156,15 @@ public class IssueWorkflow implements Serializable {StateSpec open = new StateSpec();open.setName("Open");- open.setColor("#f1c232");+ open.setColor("#f0ad4e");open.setFields(Lists.newArrayList("Type", "Priority", "Assignee"));stateSpecs.add(open);StateSpec closed = new StateSpec();- closed.setColor("#cccccc");+ closed.setColor("#777");closed.setName("Closed");+ closed.setClosed(true);closed.setFields(Lists.newArrayList("Resolution", "Duplicate With"));stateSpecs.add(closed);@@ -387,5 +392,20 @@ public class IssueWorkflow implements Serializable {applicableFields.addAll(getStateSpecs().get(i).getFields());return applicableFields;}++ @Nullable+ public IssueCriteria getStatesCriteria(boolean closed) {+ List<IssueCriteria> criterias = new ArrayList<>();+ for (StateSpec state: getStateSpecs()) {+ if (closed == state.isClosed())+ 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;+ }}diff --git a/core/src/main/java/io/onedev/server/model/support/issue/workflow/StateSpec.java b/core/src/main/java/io/onedev/server/model/support/issue/workflow/StateSpec.javaindex 2585a5fb15..eb001a434a 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/workflow/StateSpec.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/workflow/StateSpec.java@@ -11,6 +11,7 @@ import io.onedev.server.util.inputspec.InputSpec;import io.onedev.server.web.editable.annotation.ChoiceProvider;import io.onedev.server.web.editable.annotation.Color;import io.onedev.server.web.editable.annotation.Editable;+import io.onedev.server.web.editable.annotation.Multiline;import io.onedev.server.web.editable.annotation.NameOfEmptyValue;import io.onedev.server.web.page.project.setting.issueworkflow.states.IssueStatesPage;import io.onedev.server.web.util.WicketUtils;@@ -22,6 +23,8 @@ public class StateSpec implements Serializable {private String name;+ private boolean closed;+private String description;private String color = "#777777";@@ -38,8 +41,18 @@ public class StateSpec implements Serializable {this.name = name;}+ @Editable(order=150, description="Check this to indicate a closed state")+ public boolean isClosed() {+ return closed;+ }++ public void setClosed(boolean closed) {+ this.closed = closed;+ }+@Editable(order=200)@NameOfEmptyValue("No description")+ @Multilinepublic String getDescription() {return description;}diff --git a/core/src/main/java/io/onedev/server/model/support/issue/workflow/TransitionSpec.java b/core/src/main/java/io/onedev/server/model/support/issue/workflow/TransitionSpec.javaindex 0609248077..23e0bd6473 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/workflow/TransitionSpec.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/workflow/TransitionSpec.java@@ -16,6 +16,7 @@ import io.onedev.server.model.support.issue.workflow.action.PressButton;import io.onedev.server.model.support.issue.workflow.transitionprerequisite.TransitionPrerequisite;import io.onedev.server.web.editable.annotation.ChoiceProvider;import io.onedev.server.web.editable.annotation.Editable;+import io.onedev.server.web.editable.annotation.Multiline;import io.onedev.server.web.editable.annotation.NameOfEmptyValue;import io.onedev.server.web.page.project.setting.issueworkflow.IssueWorkflowPage;import io.onedev.server.web.util.WicketUtils;@@ -26,6 +27,8 @@ public class TransitionSpec implements Serializable {private static final long serialVersionUID = 1L;+ private String description;+private List<String> fromStates;private String toState;@@ -34,6 +37,17 @@ public class TransitionSpec implements Serializable {private IssueAction onAction;+ @Editable(order=50)+ @NameOfEmptyValue("No description")+ @Multiline+ public String getDescription() {+ return description;+ }++ public void setDescription(String description) {+ this.description = description;+ }+@Editable(order=100)@Size(min=1, message="At least one state needs to be specified")@ChoiceProvider("getStateChoices")diff --git a/core/src/main/java/io/onedev/server/util/MilestoneSort.java b/core/src/main/java/io/onedev/server/util/MilestoneSort.javanew file mode 100644index 0000000000..059da88b63--- /dev/null+++ b/core/src/main/java/io/onedev/server/util/MilestoneSort.java@@ -0,0 +1,87 @@+package io.onedev.server.util;++import org.eclipse.jgit.util.StringUtils;+import org.hibernate.criterion.Order;++public enum MilestoneSort {+ RECENTLY_UPDATED {++ @Override+ public Order getOrder() {+ return Order.desc("updateDate");+ }++ },+ FURTHEST_DUE_DATE {++ @Override+ public Order getOrder() {+ return Order.desc("dueDate");+ }++ },+ CLOSEST_DUE_DATE {++ @Override+ public Order getOrder() {+ return Order.asc("dueDate");+ }++ },+ MOST_ISSUES {++ @Override+ public Order getOrder() {+ return Order.desc("numOfOpenIssues");+ }++ },+ LEAST_ISSUES {++ @Override+ public Order getOrder() {+ return Order.asc("numOfOpenIssues");+ }++ },+ MOST_COMPLETED {++ @Override+ public Order getOrder() {+ return Order.desc("numOfClosedIssues");+ }++ },+ LEAST_COMPLETED {++ @Override+ public Order getOrder() {+ return Order.asc("numOfClosedIssues");+ }++ },+ NAME {++ @Override+ public Order getOrder() {+ return Order.asc("name");+ }++ },+ NAME_REVERSELY {++ @Override+ public Order getOrder() {+ return Order.desc("name");+ }++ };++ public abstract Order getOrder();++ @Override+ public String toString() {+ return StringUtils.capitalize(name().toLowerCase().replace("_", " "));+ }++}diff --git a/core/src/main/java/io/onedev/server/util/inputspec/InputSpec.java b/core/src/main/java/io/onedev/server/util/inputspec/InputSpec.javaindex 7778e7b765..2a2714d9e1 100644--- a/core/src/main/java/io/onedev/server/util/inputspec/InputSpec.java+++ b/core/src/main/java/io/onedev/server/util/inputspec/InputSpec.java@@ -20,6 +20,7 @@ import io.onedev.server.util.OneContext;import io.onedev.server.util.inputspec.showcondition.ShowCondition;import io.onedev.server.util.validation.annotation.InputName;import io.onedev.server.web.editable.annotation.Editable;+import io.onedev.server.web.editable.annotation.Multiline;import io.onedev.server.web.editable.annotation.NameOfEmptyValue;@Editable@@ -72,6 +73,7 @@ public abstract class InputSpec implements Serializable {@Editable(order=30, description="resource.input.description")@NameOfEmptyValue("No description")+ @Multilinepublic String getDescription() {return description;}@@ -148,7 +150,7 @@ public abstract class InputSpec implements Serializable {}protected void appendField(StringBuffer buffer, int index, String type) {- buffer.append(" private " + type + " input" + index + ";\n");+ buffer.append(" private Optional<" + type + "> input" + index + ";\n");buffer.append("\n");}@@ -170,25 +172,29 @@ public abstract class InputSpec implements Serializable {buffer.append(" @NameOfEmptyValue(\"" + escape(getNameOfEmptyValue()) + "\")");}- protected void appendDefaultValueProvider(StringBuffer buffer, int index) {- buffer.append(" @DefaultValueProvider(\"getDefaultInput" + index + "\")\n");- }-protected void appendMethods(StringBuffer buffer, int index, String type,@Nullable Serializable choiceProvider, @Nullable Serializable defaultValueProvider) {+ String literalBytes = getLiteral(SerializationUtils.serialize(defaultValueProvider));buffer.append(" public " + type + " getInput" + index + "() {\n");- buffer.append(" return input" + index + ";\n");+ buffer.append(" if (input" + index + "!=null) {\n");+ buffer.append(" return input" + index + ".orNull();\n");+ buffer.append(" } else {\n");+ if (defaultValueProvider != null)+ buffer.append(" return SerializationUtils.deserialize(" + literalBytes + ").getDefaultValue();\n");+ else+ buffer.append(" return null;\n");+ buffer.append(" }\n");buffer.append(" }\n");buffer.append("\n");buffer.append(" public void setInput" + index + "(" + type + " value) {\n");- buffer.append(" this.input" + index + "=value;\n");+ buffer.append(" this.input" + index + "=Optional.fromNullable(value);\n");buffer.append(" }\n");buffer.append("\n");if (showCondition != null) {buffer.append(" private static boolean isInput" + index + "Visible() {\n");- String literalBytes = getLiteral(SerializationUtils.serialize(showCondition));+ literalBytes = getLiteral(SerializationUtils.serialize(showCondition));buffer.append(" return SerializationUtils.deserialize(" + literalBytes + ").isVisible();\n");buffer.append(" }\n");buffer.append("\n");@@ -196,7 +202,7 @@ public abstract class InputSpec implements Serializable {if (choiceProvider != null) {buffer.append(" private static List getInput" + index + "Choices() {\n");- String literalBytes = getLiteral(SerializationUtils.serialize(choiceProvider));+ literalBytes = getLiteral(SerializationUtils.serialize(choiceProvider));if (choiceProvider instanceof io.onedev.server.util.inputspec.choiceinput.choiceprovider.ChoiceProvider) {buffer.append(" return new ArrayList(SerializationUtils.deserialize(" + literalBytes + ").getChoices(false).keySet());\n");} else {@@ -205,14 +211,6 @@ public abstract class InputSpec implements Serializable {buffer.append(" }\n");buffer.append("\n");}-- if (defaultValueProvider != null) {- buffer.append(" private static " + type + " getDefaultInput" + index + "() {\n");- String literalBytes = getLiteral(SerializationUtils.serialize(defaultValueProvider));- buffer.append(" return SerializationUtils.deserialize(" + literalBytes + ").getDefaultValue();\n");- buffer.append(" }\n");- buffer.append("\n");- }}public void onRenameInput(String oldName, String newName) {@@ -227,6 +225,7 @@ public abstract class InputSpec implements Serializable {public static Class<?> defineClass(String className, List<InputSpec> inputs) {StringBuffer buffer = new StringBuffer();buffer.append("import org.apache.commons.lang3.SerializationUtils;\n");+ buffer.append("import com.google.common.base.Optional;\n");buffer.append("import io.onedev.server.web.editable.annotation.*;\n");buffer.append("import io.onedev.util.*;\n");buffer.append("import io.onedev.server.util.*;\n");diff --git a/core/src/main/java/io/onedev/server/util/inputspec/booleaninput/BooleanInput.java b/core/src/main/java/io/onedev/server/util/inputspec/booleaninput/BooleanInput.javaindex 0c851390f9..3f1f0a90fb 100644--- a/core/src/main/java/io/onedev/server/util/inputspec/booleaninput/BooleanInput.java+++ b/core/src/main/java/io/onedev/server/util/inputspec/booleaninput/BooleanInput.java@@ -54,8 +54,6 @@ public class BooleanInput extends InputSpec {appendField(buffer, index, "Boolean");appendCommonAnnotations(buffer, index);buffer.append(" @NotNull\n");- if (defaultValueProvider != null)- appendDefaultValueProvider(buffer, index);appendMethods(buffer, index, "Boolean", null, defaultValueProvider);return buffer.toString();diff --git a/core/src/main/java/io/onedev/server/util/inputspec/choiceinput/ChoiceInput.java b/core/src/main/java/io/onedev/server/util/inputspec/choiceinput/ChoiceInput.javaindex 15248ee247..eb3cd070c0 100644--- a/core/src/main/java/io/onedev/server/util/inputspec/choiceinput/ChoiceInput.java+++ b/core/src/main/java/io/onedev/server/util/inputspec/choiceinput/ChoiceInput.java@@ -95,15 +95,10 @@ public class ChoiceInput extends InputSpec {}appendChoiceProvider(buffer, index, "@ChoiceProvider");- if (isAllowMultiple()) {- if (defaultMultiValueProvider != null)- appendDefaultValueProvider(buffer, index);+ if (isAllowMultiple())appendMethods(buffer, index, "List<String>", choiceProvider, defaultMultiValueProvider);- } else {- if (defaultValueProvider != null)- appendDefaultValueProvider(buffer, index);+ elseappendMethods(buffer, index, "String", choiceProvider, defaultValueProvider);- }return buffer.toString();}diff --git a/core/src/main/java/io/onedev/server/util/inputspec/dateinput/DateInput.java b/core/src/main/java/io/onedev/server/util/inputspec/dateinput/DateInput.javaindex c78796ff8b..a351af6d5d 100644--- a/core/src/main/java/io/onedev/server/util/inputspec/dateinput/DateInput.java+++ b/core/src/main/java/io/onedev/server/util/inputspec/dateinput/DateInput.java@@ -40,8 +40,6 @@ public class DateInput extends InputSpec {appendCommonAnnotations(buffer, index);if (!isAllowEmpty())buffer.append(" @NotNull\n");- if (defaultValueProvider != null)- appendDefaultValueProvider(buffer, index);appendMethods(buffer, index, "Date", null, defaultValueProvider);return buffer.toString();diff --git a/core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/GroupChoiceInput.java b/core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/GroupChoiceInput.javaindex 2f0d655d05..d5336e87a9 100644--- a/core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/GroupChoiceInput.java+++ b/core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/GroupChoiceInput.java@@ -66,8 +66,6 @@ public class GroupChoiceInput extends InputSpec {if (!isAllowEmpty())buffer.append(" @NotEmpty\n");appendChoiceProvider(buffer, index, "@GroupChoice");- if (defaultValueProvider != null)- appendDefaultValueProvider(buffer, index);appendMethods(buffer, index, "String", choiceProvider, defaultValueProvider);return buffer.toString();diff --git a/core/src/main/java/io/onedev/server/util/inputspec/numberinput/NumberInput.java b/core/src/main/java/io/onedev/server/util/inputspec/numberinput/NumberInput.javaindex 673f44f661..87332bd77b 100644--- a/core/src/main/java/io/onedev/server/util/inputspec/numberinput/NumberInput.java+++ b/core/src/main/java/io/onedev/server/util/inputspec/numberinput/NumberInput.java@@ -58,8 +58,6 @@ public class NumberInput extends InputSpec {appendCommonAnnotations(buffer, index);if (!isAllowEmpty())buffer.append(" @NotNull\n");- if (defaultValueProvider != null)- appendDefaultValueProvider(buffer, index);if (minValue != null) {if (maxValue != null) {buffer.append(" @Range(min=" + minValue.toString() + "L,max=" + maxValue.toString() +"L)\n");diff --git a/core/src/main/java/io/onedev/server/util/inputspec/passwordinput/PasswordInput.java b/core/src/main/java/io/onedev/server/util/inputspec/passwordinput/PasswordInput.javaindex 963215524b..e4d92aee6f 100644--- a/core/src/main/java/io/onedev/server/util/inputspec/passwordinput/PasswordInput.java+++ b/core/src/main/java/io/onedev/server/util/inputspec/passwordinput/PasswordInput.java@@ -40,8 +40,6 @@ public class PasswordInput extends InputSpec {appendCommonAnnotations(buffer, index);if (!isAllowEmpty())buffer.append(" @NotEmpty\n");- if (defaultValueProvider != null)- appendDefaultValueProvider(buffer, index);buffer.append(" @Password\n");appendMethods(buffer, index, "String", null, defaultValueProvider);diff --git a/core/src/main/java/io/onedev/server/util/inputspec/textinput/TextInput.java b/core/src/main/java/io/onedev/server/util/inputspec/textinput/TextInput.javaindex c1f145cf18..2f2dad1a7e 100644--- a/core/src/main/java/io/onedev/server/util/inputspec/textinput/TextInput.java+++ b/core/src/main/java/io/onedev/server/util/inputspec/textinput/TextInput.java@@ -63,8 +63,6 @@ public class TextInput extends InputSpec {appendCommonAnnotations(buffer, index);if (!isAllowEmpty())buffer.append(" @NotEmpty\n");- if (defaultValueProvider != null)- appendDefaultValueProvider(buffer, index);if (isMultiline())buffer.append(" @Multiline\n");if (getPattern() != null)diff --git a/core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/UserChoiceInput.java b/core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/UserChoiceInput.javaindex 93116ef41f..3ee82c2b45 100644--- a/core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/UserChoiceInput.java+++ b/core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/UserChoiceInput.java@@ -67,8 +67,6 @@ public class UserChoiceInput extends InputSpec {if (!isAllowEmpty())buffer.append(" @NotEmpty\n");appendChoiceProvider(buffer, index, "@UserChoice");- if (defaultValueProvider != null)- appendDefaultValueProvider(buffer, index);appendMethods(buffer, index, "String", choiceProvider, defaultValueProvider);return buffer.toString();diff --git a/core/src/main/java/io/onedev/server/web/OneUrlMapper.java b/core/src/main/java/io/onedev/server/web/OneUrlMapper.javaindex 0dc6344080..0052ad45b3 100644--- a/core/src/main/java/io/onedev/server/web/OneUrlMapper.java+++ b/core/src/main/java/io/onedev/server/web/OneUrlMapper.java@@ -36,6 +36,10 @@ import io.onedev.server.web.page.project.issues.issueboards.BoardEditPage;import io.onedev.server.web.page.project.issues.issueboards.IssueBoardsPage;import io.onedev.server.web.page.project.issues.issuedetail.activities.IssueActivitiesPage;import io.onedev.server.web.page.project.issues.issuelist.IssueListPage;+import io.onedev.server.web.page.project.issues.milestones.MilestoneDetailPage;+import io.onedev.server.web.page.project.issues.milestones.MilestoneEditPage;+import io.onedev.server.web.page.project.issues.milestones.MilestoneListPage;+import io.onedev.server.web.page.project.issues.milestones.NewMilestonePage;import io.onedev.server.web.page.project.issues.newissue.NewIssuePage;import io.onedev.server.web.page.project.pullrequests.InvalidRequestPage;import io.onedev.server.web.page.project.pullrequests.newrequest.NewRequestPage;@@ -204,6 +208,10 @@ public class OneUrlMapper extends CompoundRequestMapper {add(new OnePageMapper("projects/${project}/issue-list", IssueListPage.class));add(new OnePageMapper("projects/${project}/issues/${issue}/activities", IssueActivitiesPage.class));add(new OnePageMapper("projects/${project}/issues/new", NewIssuePage.class));+ add(new OnePageMapper("projects/${project}/milestones", MilestoneListPage.class));+ add(new OnePageMapper("projects/${project}/milestones/${milestone}", MilestoneDetailPage.class));+ add(new OnePageMapper("projects/${project}/milestones/${milestone}/edit", MilestoneEditPage.class));+ add(new OnePageMapper("projects/${project}/milestones/new", NewMilestonePage.class));add(new OnePageMapper("projects/${project}/settings/general", GeneralSettingPage.class));add(new OnePageMapper("projects/${project}/settings/authorizations", ProjectAuthorizationsPage.class));diff --git a/core/src/main/java/io/onedev/server/web/behavior/ConfirmBehavior.java b/core/src/main/java/io/onedev/server/web/behavior/ConfirmBehavior.javanew file mode 100644index 0000000000..9e0d83407c--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/behavior/ConfirmBehavior.java@@ -0,0 +1,15 @@+package io.onedev.server.web.behavior;++import org.apache.wicket.ajax.AjaxRequestTarget;+import org.unbescape.javascript.JavaScriptEscape;++@SuppressWarnings("serial")+public abstract class ConfirmBehavior extends AbstractPostAjaxBehavior {++ public void confirm(AjaxRequestTarget target, String message) {+ target.appendJavaScript(String.format("if (confirm('%s')) {%s}",+ JavaScriptEscape.escapeJavaScript(message), getCallbackScript()));+ target.appendJavaScript(getCallbackScript());+ }++}diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/IssueQueryBehavior.java b/core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.javasimilarity index 97%rename from core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/IssueQueryBehavior.javarename to core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.javaindex 371f150a09..ce897cf7c7 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/IssueQueryBehavior.java+++ b/core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.project.issues.issuelist;+package io.onedev.server.web.behavior;import java.util.ArrayList;import java.util.List;@@ -165,7 +165,10 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {suggestions.addAll(getSuggestions(candidates, unfencedLowerCaseMatchWith, "\"\\"));} finally {OneContext.pop();- }+ }+ } else if (fieldName.equals(Issue.MILESTONE)) {+ List<String> candidates = project.getMilestones().stream().map(it->it.getName()).collect(Collectors.toList());+ suggestions.addAll(getSuggestions(candidates, unfencedLowerCaseMatchWith, "\"\\"));} else if (fieldName.equals(Issue.TITLE) || fieldName.equals(Issue.DESCRIPTION)|| fieldName.equals(Issue.VOTES) || fieldName.equals(Issue.COMMENTS)|| fieldName.equals(Issue.NUMBER) || fieldSpec instanceof NumberInputdiff --git a/core/src/main/java/io/onedev/server/web/component/issuelist/IssueListPanel.html b/core/src/main/java/io/onedev/server/web/component/issuelist/IssueListPanel.htmlnew file mode 100644index 0000000000..62e5cdecb0--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/component/issuelist/IssueListPanel.html@@ -0,0 +1,65 @@+<wicket:panel>+ <div class="issue-list">+ <div class="head">+ <form wicket:id="query">+ <div class="input-group no-autofocus">+ <input wicket:id="input" spellcheck="false" autocomplete="off" class="form-control" placeholder="Query and order issues here"></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>+ </div>+ </form>+ <div class="actions">+ <a wicket:id="displayFields" class="btn btn-default display-fields" title="Custom fields to display"><i class="fa fa-list-ul"></i></a>+ <a wicket:id="newIssue" class="btn btn-success open-new"><i class="fa fa-plus"></i> Open New</a>+ </div>+ </div>+ <div class="body">+ <div wicket:id="feedback"></div>+ <div wicket:id="issues">+ <div class="primary">+ <div wicket:id="number" class="number"></div>+ <div wicket:id="title" class="title"></div>+ <div class="last-activity">+ <a wicket:id="user"></a>+ <span wicket:id="action"></span>+ <span wicket:id="date"></span>+ </div>+ </div>+ <div class="additional">+ <div class="state"><div wicket:id="state"></div></div>+ <div wicket:id="fields"></div>+ <div class="built-in">+ <wicket:enclosure child="milestone">+ <span title="Milestone"><i class="fa fa-ext fa-milestone"></i> <a wicket:id="milestone"><span wicket:id="name"></span></a></span>+ </wicket:enclosure>+ <span title="Votes"><i class="fa fa-thumbs-o-up"></i> <span wicket:id="votes" class="votes"></span></span>+ <span title="Comments"><i class="fa fa-comments"></i> <span wicket:id="comments" class="comments"></span></span>+ </div>+ </div>+ </div>+ <div class="center"><ul wicket:id="issuesPageNav"></ul></div>+ <div wicket:id="noIssues" class="no-records">No issues found</div>+ </div>+ </div>+ <wicket:fragment wicket:id="titleFrag">+ <a wicket:id="link"><span wicket:id="label"></span></a>+ </wicket:fragment>+ <wicket:fragment wicket:id="fieldsFrag">+ <form wicket:id="form" class="issue-table-fields leave-confirm no-autofocus">+ <div class="modal-header">+ <button wicket:id="close" type="button" class="close">×</button>+ <h4 id="modal-title" class="modal-title">+ Fields to Display+ </h4>+ </div>+ <div class="modal-body">+ <div wicket:id="editor"></div>+ </div>+ <div class="modal-footer clearfix">+ <input wicket:id="save" type="submit" class="dirty-aware btn btn-primary" value="Save"></input>+ <a wicket:id="cancel" class="btn btn-default">Cancel</a>+ </div>+ </form>+ </wicket:fragment>+</wicket:panel>\ No newline at end of filediff --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.javanew file mode 100644index 0000000000..afebcb1e2b--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/component/issuelist/IssueListPanel.java@@ -0,0 +1,398 @@+package io.onedev.server.web.component.issuelist;++import java.util.ArrayList;+import java.util.Date;+import java.util.Iterator;+import java.util.List;++import javax.annotation.Nullable;++import org.apache.wicket.Component;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;+import org.apache.wicket.ajax.markup.html.AjaxLink;+import org.apache.wicket.ajax.markup.html.form.AjaxButton;+import org.apache.wicket.behavior.AttributeAppender;+import org.apache.wicket.markup.ComponentTag;+import org.apache.wicket.markup.head.CssHeaderItem;+import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.html.WebMarkupContainer;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.form.Form;+import org.apache.wicket.markup.html.form.TextField;+import org.apache.wicket.markup.html.link.BookmarkablePageLink;+import org.apache.wicket.markup.html.link.Link;+import org.apache.wicket.markup.html.panel.Fragment;+import org.apache.wicket.markup.html.panel.GenericPanel;+import org.apache.wicket.markup.repeater.Item;+import org.apache.wicket.markup.repeater.RepeatingView;+import org.apache.wicket.markup.repeater.data.DataView;+import org.apache.wicket.markup.repeater.data.IDataProvider;+import org.apache.wicket.model.AbstractReadOnlyModel;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.LoadableDetachableModel;+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;+import io.onedev.server.manager.ProjectManager;+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.FieldsEditBean;+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;+import io.onedev.server.web.WebConstants;+import io.onedev.server.web.behavior.IssueQueryBehavior;+import io.onedev.server.web.component.IssueStateLabel;+import io.onedev.server.web.component.datatable.HistoryAwarePagingNavigator;+import io.onedev.server.web.component.link.UserLink;+import io.onedev.server.web.component.modal.ModalLink;+import io.onedev.server.web.component.modal.ModalPanel;+import io.onedev.server.web.editable.BeanContext;+import io.onedev.server.web.page.project.issues.fieldvalues.FieldValuesPanel;+import io.onedev.server.web.page.project.issues.issuedetail.activities.IssueActivitiesPage;+import io.onedev.server.web.page.project.issues.milestones.MilestoneDetailPage;+import io.onedev.server.web.page.project.issues.newissue.NewIssuePage;+import io.onedev.server.web.util.PagingHistorySupport;+import io.onedev.server.web.util.QueryPosition;+import io.onedev.utils.StringUtils;++@SuppressWarnings("serial")+public abstract class IssueListPanel extends GenericPanel<String> {++ private static final Logger logger = LoggerFactory.getLogger(IssueListPanel.class);++ private IModel<IssueQuery> parsedQueryModel = new LoadableDetachableModel<IssueQuery>() {++ @Override+ protected IssueQuery load() {+ IssueQuery parsedQuery = null;+ try {+ parsedQuery = IssueQuery.parse(getProject(), getQuery(), true);+ if (SecurityUtils.getUser() == null && parsedQuery.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());+ }+ }+ } catch (Exception e) {+ logger.error("Error parsing issue query: " + getQuery(), e);+ if (StringUtils.isNotBlank(e.getMessage()))+ error(e.getMessage());+ else+ error("Malformed issue query");+ }+ return parsedQuery;+ }++ };++ private IModel<Integer> countModel = new LoadableDetachableModel<Integer>() {++ @Override+ protected Integer load() {+ IssueQuery parsedQuery = parsedQueryModel.getObject();+ if (parsedQuery != null)+ return getIssueManager().count(getProject(), parsedQuery.getCriteria());+ else+ return 0;+ }++ };++ public IssueListPanel(String id, IModel<String> queryModel) {+ super(id, queryModel);+ }++ private IssueManager getIssueManager() {+ return OneDev.getInstance(IssueManager.class);+ }++ private String getQuery() {+ return getModelObject();+ }++ @Override+ protected void onDetach() {+ parsedQueryModel.detach();+ countModel.detach();+ super.onDetach();+ }++ protected abstract Project getProject();++ @Nullable+ protected abstract IssueCriteria getBaseCriteria();++ protected abstract PagingHistorySupport getPagingHistorySupport();++ protected abstract void onQueryUpdated(AjaxRequestTarget target);++ protected abstract void onQueryUpdating(AjaxRequestTarget target);++ @Override+ protected void onInitialize() {+ super.onInitialize();++ TextField<String> input = new TextField<String>("input", getModel());+ input.add(new IssueQueryBehavior(new AbstractReadOnlyModel<Project>() {++ @Override+ public Project getObject() {+ return getProject();+ }++ }));+ input.add(new AjaxFormComponentUpdatingBehavior("input"){++ @Override+ protected void onUpdate(AjaxRequestTarget target) {+ onQueryUpdating(target);+ }++ });++ Form<?> form = new Form<Void>("query");+ form.add(input);+ form.add(new AjaxButton("submit") {++ @Override+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {+ super.onSubmit(target, form);+ target.add(IssueListPanel.this);+ onQueryUpdated(target);+ }++ });+ add(form);++ add(new ModalLink("displayFields") {++ @Override+ protected Component newContent(String id, ModalPanel modal) {+ Fragment fragment = new Fragment(id, "fieldsFrag", IssueListPanel.this);++ FieldsEditBean bean = new FieldsEditBean();+ bean.setFields(getProject().getIssueListFields());+ Form<?> form = new Form<Void>("form") {++ @Override+ protected void onError() {+ super.onError();+ RequestCycle.get().find(AjaxRequestTarget.class).add(this);+ }++ };+ form.add(BeanContext.editBean("editor", bean));++ form.add(new AjaxLink<Void>("close") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ modal.close();+ }++ });++ form.add(new AjaxButton("save") {++ @Override+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {+ super.onSubmit(target, form);+ getProject().setIssueListFields((ArrayList<String>) bean.getFields());+ OneDev.getInstance(ProjectManager.class).save(getProject());+ target.add(IssueListPanel.this);+ }++ });++ form.add(new AjaxLink<Void>("cancel") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ modal.close();+ }++ });+ form.setOutputMarkupId(true);+ fragment.add(form);+ return fragment;+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(SecurityUtils.canManage(getProject()));+ }++ });++ String query;+ if (parsedQueryModel.getObject() != null)+ query = parsedQueryModel.getObject().toString();+ else+ query = null;+ add(new BookmarkablePageLink<Void>("newIssue", NewIssuePage.class, NewIssuePage.paramsOf(getProject(), query)) {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(SecurityUtils.canRead(getProject()));+ }++ });++ IDataProvider<Issue> dataProvider = new IDataProvider<Issue>() {++ @Override+ public void detach() {+ }++ @Override+ public Iterator<? extends Issue> iterator(long first, long count) {+ return getIssueManager().query(getProject(), parsedQueryModel.getObject(), (int)first, (int)count).iterator();+ }++ @Override+ public long size() {+ return countModel.getObject();+ }++ @Override+ public IModel<Issue> model(Issue object) {+ Long issueId = object.getId();+ return new LoadableDetachableModel<Issue>() {++ @Override+ protected Issue load() {+ return OneDev.getInstance(IssueManager.class).load(issueId);+ }++ };+ }++ };++ add(new NotificationPanel("feedback", this));++ DataView<Issue> issuesView = new DataView<Issue>("issues", dataProvider) {++ @Override+ protected void populateItem(Item<Issue> item) {+ Issue issue = item.getModelObject();+ item.add(new Label("number", "#" + issue.getNumber()));+ Fragment titleFrag = new Fragment("title", "titleFrag", IssueListPanel.this);+ QueryPosition position = new QueryPosition(parsedQueryModel.getObject().toString(), countModel.getObject(),+ (int)getCurrentPage() * WebConstants.PAGE_SIZE + item.getIndex());+ Link<Void> link = new BookmarkablePageLink<Void>("link", IssueActivitiesPage.class,+ IssueActivitiesPage.paramsOf(issue, position));+ link.add(new Label("label", issue.getTitle()));+ titleFrag.add(link);+ item.add(titleFrag);++ item.add(new UserLink("user",+ User.getForDisplay(issue.getLastActivity().getUser(), issue.getLastActivity().getUserName())));+ item.add(new Label("action", issue.getLastActivity().getAction()));+ item.add(new Label("date", DateUtils.formatAge(issue.getLastActivity().getDate())));++ item.add(new IssueStateLabel("state", item.getModel()));++ RepeatingView fieldsView = new RepeatingView("fields");+ for (String fieldName: getProject().getIssueListFields()) {+ fieldsView.add(new FieldValuesPanel(fieldsView.newChildId()) {++ @Override+ protected Issue getIssue() {+ return item.getModelObject();+ }++ @Override+ protected IssueField getField() {+ return item.getModelObject().getEffectiveFields().get(fieldName);+ }++ }.add(AttributeAppender.append("title", fieldName)));+ }++ item.add(fieldsView);+ if (issue.getMilestone() != null) {+ Link<Void> milestoneLink = new BookmarkablePageLink<Void>("milestone", MilestoneDetailPage.class,+ MilestoneDetailPage.paramsOf(issue.getMilestone(), null));+ milestoneLink.add(new Label("name", issue.getMilestoneName()));+ item.add(milestoneLink);+ } else {+ WebMarkupContainer milestoneLink = new WebMarkupContainer("milestone") {++ @Override+ protected void onComponentTag(ComponentTag tag) {+ super.onComponentTag(tag);+ tag.setName("span");+ }++ };+ milestoneLink.add(new Label("name", "<i>Unspecified</i>").setEscapeModelStrings(false));+ item.add(milestoneLink);+ }+ item.add(new Label("votes", issue.getNumOfVotes()));+ item.add(new Label("comments", issue.getNumOfComments()));++ Date lastActivityDate;+ if (issue.getLastActivity() != null)+ lastActivityDate = issue.getLastActivity().getDate();+ else+ lastActivityDate = issue.getSubmitDate();+ item.add(AttributeAppender.append("class",+ issue.isVisitedAfter(lastActivityDate)?"issue":"issue new"));+ }++ };+ issuesView.setItemsPerPage(WebConstants.PAGE_SIZE);++ issuesView.setCurrentPage(getPagingHistorySupport().getCurrentPage());++ add(issuesView);++ add(new HistoryAwarePagingNavigator("issuesPageNav", issuesView, getPagingHistorySupport()) {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(issuesView.getPageCount() > 1);+ }++ });+ add(new WebMarkupContainer("noIssues") {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(parsedQueryModel.getObject() != null && countModel.getObject() == 0);+ }++ });++ setOutputMarkupId(true);+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(CssHeaderItem.forReference(new IssueListResourceReference()));+ }++}diff --git a/core/src/main/java/io/onedev/server/web/component/issuelist/IssueListResourceReference.java b/core/src/main/java/io/onedev/server/web/component/issuelist/IssueListResourceReference.javanew file mode 100644index 0000000000..e736626eb4--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/component/issuelist/IssueListResourceReference.java@@ -0,0 +1,13 @@+package io.onedev.server.web.component.issuelist;++import io.onedev.server.web.page.base.BaseDependentCssResourceReference;++public class IssueListResourceReference extends BaseDependentCssResourceReference {++ private static final long serialVersionUID = 1L;++ public IssueListResourceReference() {+ super(IssueListResourceReference.class, "issue-list.css");+ }++}diff --git a/core/src/main/java/io/onedev/server/web/component/issuelist/issue-list.css b/core/src/main/java/io/onedev/server/web/component/issuelist/issue-list.cssnew file mode 100644index 0000000000..adb3d0b908--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/component/issuelist/issue-list.css@@ -0,0 +1,89 @@+.issue-list>.head {+ position: relative;+ margin-bottom: 20px;+}+.issue-list>.head>form {+ margin-right: 200px;+}+.issue-list>.head>.actions {+ position: absolute;+ right: 0;+ top: 0;+}++.issue-list .issue {+ border-bottom: 2px solid #DDD;+ margin-bottom: 12px;+ border-left: 4px solid white;+ padding-left: 8px;+}+.issue-list .new.issue {+ border-left-color: #4667EE;+}+.issue-list .issue .primary {+ display: table;+ table-layout: fixed;+ width: 100%;+}+.issue-list .issue .primary>div {+ display: table-cell;+ white-space: nowrap;+ overflow: hidden;+ text-overflow: ellipsis;+ padding-right: 8px;+}+.issue-list .issue .primary .number {+ width: 75px;+ font-size: 16px;+ font-weight: bold;+}+.issue-list .issue .primary .title a {+ font-size: 16px;+ font-weight: bold;+}+.issue-list .issue .primary .last-activity {+ text-align: right;+ width: 300px;+ padding-right: 0;+}+.issue-list .issue .additional {+ display: table;+ table-layout: fixed;+ width: 100%;+}+.issue-list .issue .additional>div {+ display: table-cell;+ padding: 8px 8px 8px 0;+}+.issue-list .issue .additional .state>div {+ color: white;+}+.issue-list .issue .additional .field-values>.value {+ overflow: hidden;+ white-space: nowrap;+ text-overflow: ellipsis;+}+.issue-list .issue .additional .field-values>.white.value {+ color: white;+}++.issue-list .issue .additional .state>div,+.issue-list .issue .additional .field-values .value>div,+.issue-list .issue .additional .field-values i {+ display: table-cell;+ padding: 3px 6px;+ border-radius: 3px;+}+.issue-list .issue .additional .state>div {+ font-weight: bold;+}+.issue-list .issue .additional>.built-in{+ text-align: right;+ padding-right: 0;+}+.issue-list .issue .additional>.built-in>span {+ margin-right: 8px;+}+.issue-list .issue .additional>.built-in>span:last-child {+ margin-right: 0;+}diff --git a/core/src/main/java/io/onedev/server/web/component/select2/Settings.java b/core/src/main/java/io/onedev/server/web/component/select2/Settings.javaindex 0ea1d44406..bfb17aaebb 100644--- a/core/src/main/java/io/onedev/server/web/component/select2/Settings.java+++ b/core/src/main/java/io/onedev/server/web/component/select2/Settings.java@@ -13,11 +13,15 @@package io.onedev.server.web.component.select2;import java.io.Serializable;+import java.lang.reflect.Method;import org.json.JSONException;import org.json.JSONStringer;import io.onedev.server.web.component.select2.json.Json;+import io.onedev.server.web.editable.EditableUtils;+import io.onedev.server.web.editable.PropertyDescriptor;+import io.onedev.server.web.editable.annotation.OmitName;/*** Select2 settings. Refer to the Select2 documentation for what these options@@ -399,4 +403,15 @@ public final class Settings implements Serializable {public void setDropdownAutoWidth(Boolean dropdownAutoWidth) {this.dropdownAutoWidth = dropdownAutoWidth;}++ public void configurePlaceholder(PropertyDescriptor propertyDescriptor) {+ if (propertyDescriptor.isPropertyRequired()) {+ Method getter = propertyDescriptor.getPropertyGetter();+ if (getter.getAnnotation(OmitName.class) != null)+ setPlaceholder("Select " + EditableUtils.getDisplayName(getter).toLowerCase() + "...");+ } else if (propertyDescriptor.getNameOfEmptyValue() != null) {+ setPlaceholder(propertyDescriptor.getNameOfEmptyValue());+ }+ }+}diff --git a/core/src/main/java/io/onedev/server/web/editable/BeanEditor.java b/core/src/main/java/io/onedev/server/web/editable/BeanEditor.javaindex 1caeb53859..cd2c8c6692 100644--- a/core/src/main/java/io/onedev/server/web/editable/BeanEditor.java+++ b/core/src/main/java/io/onedev/server/web/editable/BeanEditor.java@@ -34,14 +34,12 @@ import io.onedev.launcher.loader.AppLoader;import io.onedev.server.util.EditContext;import io.onedev.server.util.OneContext;import io.onedev.server.web.editable.PathSegment.Property;-import io.onedev.server.web.editable.annotation.DefaultValueProvider;import io.onedev.server.web.editable.annotation.Horizontal;import io.onedev.server.web.editable.annotation.OmitName;import io.onedev.server.web.editable.annotation.Vertical;import io.onedev.server.web.editable.bean.BeanPropertyEditor;import io.onedev.server.web.editable.polymorphic.PolymorphicPropertyEditor;import io.onedev.server.web.util.ComponentContext;-import io.onedev.utils.ReflectionUtils;import io.onedev.utils.StringUtils;@SuppressWarnings("serial")@@ -170,13 +168,7 @@ public class BeanEditor extends ValueEditor<Serializable> {OneContext.push(context);try {- DefaultValueProvider defaultValueProvider = propertyContext.getPropertyGetter().getAnnotation(DefaultValueProvider.class);- if (defaultValueProvider != null) {- propertyValue = (Serializable) ReflectionUtils.invokeStaticMethod(- propertyContext.getBeanClass(), defaultValueProvider.value());- } else {- propertyValue = (Serializable) propertyContext.getPropertyValue(getModelObject());- }+ propertyValue = (Serializable) propertyContext.getPropertyValue(getModelObject());} finally {OneContext.pop();}diff --git a/core/src/main/java/io/onedev/server/web/editable/annotation/DefaultValueProvider.java b/core/src/main/java/io/onedev/server/web/editable/annotation/DefaultValueProvider.javadeleted file mode 100644index 55f726fe68..0000000000--- a/core/src/main/java/io/onedev/server/web/editable/annotation/DefaultValueProvider.java+++ /dev/null@@ -1,12 +0,0 @@-package io.onedev.server.web.editable.annotation;--import java.lang.annotation.ElementType;-import java.lang.annotation.Retention;-import java.lang.annotation.RetentionPolicy;-import java.lang.annotation.Target;--@Target({ElementType.METHOD, ElementType.FIELD})-@Retention(RetentionPolicy.RUNTIME)-public @interface DefaultValueProvider {- String value();-}\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/editable/branchchoice/BranchMultiChoiceEditor.java b/core/src/main/java/io/onedev/server/web/editable/branchchoice/BranchMultiChoiceEditor.javaindex b481179cb6..9a7d6b11a1 100644--- a/core/src/main/java/io/onedev/server/web/editable/branchchoice/BranchMultiChoiceEditor.java+++ b/core/src/main/java/io/onedev/server/web/editable/branchchoice/BranchMultiChoiceEditor.java@@ -53,8 +53,7 @@ public class BranchMultiChoiceEditor extends PropertyEditor<List<String>> {@Overrideprotected void onInitialize() {super.onInitialize();- if (!propertyDescriptor.isPropertyRequired() && propertyDescriptor.getNameOfEmptyValue() != null)- getSettings().setPlaceholder(propertyDescriptor.getNameOfEmptyValue());+ getSettings().configurePlaceholder(propertyDescriptor);}};diff --git a/core/src/main/java/io/onedev/server/web/editable/branchchoice/BranchSingleChoiceEditor.java b/core/src/main/java/io/onedev/server/web/editable/branchchoice/BranchSingleChoiceEditor.javaindex 2e7fa8a6ed..f99d71e483 100644--- a/core/src/main/java/io/onedev/server/web/editable/branchchoice/BranchSingleChoiceEditor.java+++ b/core/src/main/java/io/onedev/server/web/editable/branchchoice/BranchSingleChoiceEditor.java@@ -44,8 +44,7 @@ public class BranchSingleChoiceEditor extends PropertyEditor<String> {@Overrideprotected void onInitialize() {super.onInitialize();- if (!propertyDescriptor.isPropertyRequired() && propertyDescriptor.getNameOfEmptyValue() != null)- getSettings().setPlaceholder(propertyDescriptor.getNameOfEmptyValue());+ getSettings().configurePlaceholder(propertyDescriptor);}};diff --git a/core/src/main/java/io/onedev/server/web/editable/choice/MultiChoiceEditor.java b/core/src/main/java/io/onedev/server/web/editable/choice/MultiChoiceEditor.javaindex 1c5bebbab8..4e7a0b6dfd 100644--- a/core/src/main/java/io/onedev/server/web/editable/choice/MultiChoiceEditor.java+++ b/core/src/main/java/io/onedev/server/web/editable/choice/MultiChoiceEditor.java@@ -69,8 +69,7 @@ public class MultiChoiceEditor extends PropertyEditor<List<String>> {@Overrideprotected void onInitialize() {super.onInitialize();- if (!propertyDescriptor.isPropertyRequired() && propertyDescriptor.getNameOfEmptyValue() != null)- getSettings().setPlaceholder(propertyDescriptor.getNameOfEmptyValue());+ getSettings().configurePlaceholder(propertyDescriptor);}};diff --git a/core/src/main/java/io/onedev/server/web/editable/choice/SingleChoiceEditor.java b/core/src/main/java/io/onedev/server/web/editable/choice/SingleChoiceEditor.javaindex 866b9e7559..1115f755d0 100644--- a/core/src/main/java/io/onedev/server/web/editable/choice/SingleChoiceEditor.java+++ b/core/src/main/java/io/onedev/server/web/editable/choice/SingleChoiceEditor.java@@ -58,8 +58,7 @@ public class SingleChoiceEditor extends PropertyEditor<String> {@Overrideprotected void onInitialize() {super.onInitialize();- if (!propertyDescriptor.isPropertyRequired() && propertyDescriptor.getNameOfEmptyValue() != null)- getSettings().setPlaceholder(propertyDescriptor.getNameOfEmptyValue());+ getSettings().configurePlaceholder(propertyDescriptor);}};diff --git a/core/src/main/java/io/onedev/server/web/editable/enumeration/EnumPropertyEditor.java b/core/src/main/java/io/onedev/server/web/editable/enumeration/EnumPropertyEditor.javaindex 1a5e98c499..ea0ceca219 100644--- a/core/src/main/java/io/onedev/server/web/editable/enumeration/EnumPropertyEditor.java+++ b/core/src/main/java/io/onedev/server/web/editable/enumeration/EnumPropertyEditor.java@@ -17,7 +17,6 @@ import io.onedev.server.web.editable.ErrorContext;import io.onedev.server.web.editable.PathSegment;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;-import io.onedev.utils.WordUtils;@SuppressWarnings({ "unchecked", "rawtypes", "serial" })public class EnumPropertyEditor extends PropertyEditor<Enum<?>> {@@ -57,10 +56,7 @@ public class EnumPropertyEditor extends PropertyEditor<Enum<?>> {@Overrideprotected void onInitialize() {super.onInitialize();- if (propertyDescriptor.isPropertyRequired())- getSettings().setPlaceholder("Select " + WordUtils.uncamel(enumClass.getSimpleName()).toLowerCase() + "...");- else if (propertyDescriptor.getNameOfEmptyValue() != null)- getSettings().setPlaceholder(propertyDescriptor.getNameOfEmptyValue());+ getSettings().configurePlaceholder(propertyDescriptor);}};@@ -68,7 +64,7 @@ public class EnumPropertyEditor extends PropertyEditor<Enum<?>> {input.setRequired(propertyDescriptor.isPropertyRequired());input.setLabel(Model.of(getPropertyDescriptor().getDisplayName(this)));- input.add(new AjaxFormComponentUpdatingBehavior("change"){+ input.add(new AjaxFormComponentUpdatingBehavior("change") {@Overrideprotected void onUpdate(AjaxRequestTarget target) {diff --git a/core/src/main/java/io/onedev/server/web/editable/enumlist/EnumListPropertyEditor.java b/core/src/main/java/io/onedev/server/web/editable/enumlist/EnumListPropertyEditor.javaindex ffeae72b33..2d07c0cf67 100644--- a/core/src/main/java/io/onedev/server/web/editable/enumlist/EnumListPropertyEditor.java+++ b/core/src/main/java/io/onedev/server/web/editable/enumlist/EnumListPropertyEditor.java@@ -20,7 +20,6 @@ import io.onedev.server.web.editable.ErrorContext;import io.onedev.server.web.editable.PathSegment;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;-import io.onedev.utils.WordUtils;@SuppressWarnings({"serial", "unchecked", "rawtypes"})public class EnumListPropertyEditor extends PropertyEditor<List<Enum<?>>> {@@ -60,10 +59,7 @@ public class EnumListPropertyEditor extends PropertyEditor<List<Enum<?>>> {@Overrideprotected void onInitialize() {super.onInitialize();- if (propertyDescriptor.isPropertyRequired())- getSettings().setPlaceholder("Select " + WordUtils.uncamel(enumClass.getSimpleName()).toLowerCase() + "(s)...");- else if (propertyDescriptor.getNameOfEmptyValue() != null)- getSettings().setPlaceholder(propertyDescriptor.getNameOfEmptyValue());+ getSettings().configurePlaceholder(propertyDescriptor);}};diff --git a/core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupMultiChoiceEditor.java b/core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupMultiChoiceEditor.javaindex 582c594331..ae1d62f2bd 100644--- a/core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupMultiChoiceEditor.java+++ b/core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupMultiChoiceEditor.java@@ -76,8 +76,7 @@ public class GroupMultiChoiceEditor extends PropertyEditor<Collection<String>> {@Overrideprotected void onInitialize() {super.onInitialize();- if (!propertyDescriptor.isPropertyRequired() && propertyDescriptor.getNameOfEmptyValue() != null)- getSettings().setPlaceholder(propertyDescriptor.getNameOfEmptyValue());+ getSettings().configurePlaceholder(propertyDescriptor);}};diff --git a/core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupSingleChoiceEditor.java b/core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupSingleChoiceEditor.javaindex 77432df5c7..ef680085b6 100644--- a/core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupSingleChoiceEditor.java+++ b/core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupSingleChoiceEditor.java@@ -71,8 +71,7 @@ public class GroupSingleChoiceEditor extends PropertyEditor<String> {@Overrideprotected void onInitialize() {super.onInitialize();- if (!propertyDescriptor.isPropertyRequired() && propertyDescriptor.getNameOfEmptyValue() != null)- getSettings().setPlaceholder(propertyDescriptor.getNameOfEmptyValue());+ getSettings().configurePlaceholder(propertyDescriptor);}};diff --git a/core/src/main/java/io/onedev/server/web/editable/issuechoice/IssueChoiceEditor.java b/core/src/main/java/io/onedev/server/web/editable/issuechoice/IssueChoiceEditor.javaindex 17a80a0f77..f9d1c390ae 100644--- a/core/src/main/java/io/onedev/server/web/editable/issuechoice/IssueChoiceEditor.java+++ b/core/src/main/java/io/onedev/server/web/editable/issuechoice/IssueChoiceEditor.java@@ -56,8 +56,7 @@ public class IssueChoiceEditor extends PropertyEditor<Long> {@Overrideprotected void onInitialize() {super.onInitialize();- if (propertyDescriptor.getNameOfEmptyValue() != null)- getSettings().setPlaceholder(propertyDescriptor.getNameOfEmptyValue());+ getSettings().configurePlaceholder(propertyDescriptor);}};diff --git a/core/src/main/java/io/onedev/server/web/editable/issuequery/IssueQueryEditor.java b/core/src/main/java/io/onedev/server/web/editable/issuequery/IssueQueryEditor.javaindex 4234452a50..587ab9c542 100644--- a/core/src/main/java/io/onedev/server/web/editable/issuequery/IssueQueryEditor.java+++ b/core/src/main/java/io/onedev/server/web/editable/issuequery/IssueQueryEditor.java@@ -8,13 +8,13 @@ import org.apache.wicket.model.Model;import org.apache.wicket.util.convert.ConversionException;import io.onedev.server.model.Project;+import io.onedev.server.web.behavior.IssueQueryBehavior;import io.onedev.server.web.behavior.OnTypingDoneBehavior;import io.onedev.server.web.editable.ErrorContext;import io.onedev.server.web.editable.PathSegment;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;import io.onedev.server.web.page.project.ProjectPage;-import io.onedev.server.web.page.project.issues.issuelist.IssueQueryBehavior;@SuppressWarnings("serial")public class IssueQueryEditor extends PropertyEditor<String> {diff --git a/core/src/main/java/io/onedev/server/web/editable/userchoice/UserMultiChoiceEditor.java b/core/src/main/java/io/onedev/server/web/editable/userchoice/UserMultiChoiceEditor.javaindex 12ad621488..e7e6cf15ea 100644--- a/core/src/main/java/io/onedev/server/web/editable/userchoice/UserMultiChoiceEditor.java+++ b/core/src/main/java/io/onedev/server/web/editable/userchoice/UserMultiChoiceEditor.java@@ -77,8 +77,7 @@ public class UserMultiChoiceEditor extends PropertyEditor<List<String>> {@Overrideprotected void onInitialize() {super.onInitialize();- if (!propertyDescriptor.isPropertyRequired() && propertyDescriptor.getNameOfEmptyValue() != null)- getSettings().setPlaceholder(propertyDescriptor.getNameOfEmptyValue());+ getSettings().configurePlaceholder(propertyDescriptor);}};diff --git a/core/src/main/java/io/onedev/server/web/editable/userchoice/UserSingleChoiceEditor.java b/core/src/main/java/io/onedev/server/web/editable/userchoice/UserSingleChoiceEditor.javaindex 6d54ea97e2..f9da9e2b6a 100644--- a/core/src/main/java/io/onedev/server/web/editable/userchoice/UserSingleChoiceEditor.java+++ b/core/src/main/java/io/onedev/server/web/editable/userchoice/UserSingleChoiceEditor.java@@ -72,8 +72,7 @@ public class UserSingleChoiceEditor extends PropertyEditor<String> {@Overrideprotected void onInitialize() {super.onInitialize();- if (!propertyDescriptor.isPropertyRequired() && propertyDescriptor.getNameOfEmptyValue() != null)- getSettings().setPlaceholder(propertyDescriptor.getNameOfEmptyValue());+ getSettings().configurePlaceholder(propertyDescriptor);}};diff --git a/core/src/main/java/io/onedev/server/web/page/base/BasePage.java b/core/src/main/java/io/onedev/server/web/page/base/BasePage.javaindex 72904599c1..602ffdb730 100644--- a/core/src/main/java/io/onedev/server/web/page/base/BasePage.java+++ b/core/src/main/java/io/onedev/server/web/page/base/BasePage.java@@ -54,8 +54,6 @@ import io.onedev.server.web.websocket.WebSocketManager;@SuppressWarnings("serial")public abstract class BasePage extends WebPage {- public static final String PARAM_AUTOSAVE_KEY_TO_CLEAR = "autosaveKeyToClear";-private FeedbackPanel sessionFeedback;private RepeatingView rootComponents;diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/IssuesPage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/IssuesPage.javaindex 6b2ec8bd8c..5ebe989d3f 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/IssuesPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/IssuesPage.java@@ -26,6 +26,10 @@ import io.onedev.server.web.component.tabbable.Tabbable;import io.onedev.server.web.page.project.ProjectPage;import io.onedev.server.web.page.project.issues.issueboards.IssueBoardsPage;import io.onedev.server.web.page.project.issues.issuelist.IssueListPage;+import io.onedev.server.web.page.project.issues.milestones.MilestoneListPage;+import io.onedev.server.web.page.project.issues.milestones.NewMilestonePage;+import io.onedev.server.web.page.project.issues.milestones.MilestoneDetailPage;+import io.onedev.server.web.page.project.issues.milestones.MilestoneEditPage;import io.onedev.server.web.page.project.issues.workflowreconcile.WorkflowReconcilePanel;@SuppressWarnings("serial")@@ -111,6 +115,8 @@ public abstract class IssuesPage extends ProjectPage {});tabs.add(new IssuesTab("Boards", IssueBoardsPage.class));+ tabs.add(new IssuesTab("Milestones", MilestoneListPage.class, NewMilestonePage.class,+ MilestoneDetailPage.class, MilestoneEditPage.class));add(new Tabbable("issuesTabs", tabs));}@@ -121,6 +127,20 @@ public abstract class IssuesPage extends ProjectPage {super(Model.of(title), pageClass);}+ public IssuesTab(String title, Class<? extends Page> pageClass, Class<? extends Page> additionalPageClass1) {+ super(Model.of(title), pageClass, additionalPageClass1);+ }++ public IssuesTab(String title, Class<? extends Page> pageClass, Class<? extends Page> additionalPageClass1,+ Class<? extends Page> additionalPageClass2) {+ super(Model.of(title), pageClass, additionalPageClass1, additionalPageClass2);+ }++ public IssuesTab(String title, Class<? extends Page> pageClass, Class<? extends Page> additionalPageClass1,+ Class<? extends Page> additionalPageClass2, Class<? extends Page> additionalPageClass3) {+ super(Model.of(title), pageClass, additionalPageClass1, additionalPageClass2, additionalPageClass3);+ }+@Overridepublic Component render(String componentId) {return new PageTabLink(componentId, this) {diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.html b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.htmlindex f85a72ea22..38de923d1f 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.html+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.html@@ -20,7 +20,9 @@<div class="side"><div wicket:id="issueNav" class="nav"></div><div wicket:id="fields" class="fields">- <div class="head">Custom Fields</div>+ <div class="head">+ Custom Fields <a wicket:id="edit" title="Edit custom fields" class="edit action"><i class="fa fa-pencil"></i></a>+ </div><div class="body"><table><tr wicket:id="fields">@@ -28,9 +30,12 @@<td class="values"><div wicket:id="values"></div></td></tr></table>- <a wicket:id="edit" class="edit btn btn-default btn-sm"><i class="fa fa-pencil"></i> Edit</a></div></div>+ <div class="milestone">+ <div class="head">Milestone</div>+ <div wicket:id="milestone" class="body"></div>+ </div><div wicket:id="votes" class="votes"><div class="head">Issue Votes (<span wicket:id="count"></span>)@@ -112,4 +117,17 @@</div></form></wicket:fragment>+ <wicket:fragment wicket:id="milestoneViewFrag">+ <a wicket:id="link"><span wicket:id="label"></span></a>+ <a wicket:id="edit" class="edit action"><i class="fa fa-pencil"></i></a>+ </wicket:fragment>+ <wicket:fragment wicket:id="milestoneEditFrag">+ <form wicket:id="form">+ <input wicket:id="milestone" type="hidden" class="form-control"></input>+ <div class="actions">+ <a wicket:id="save" class="dirty-aware btn btn-primary btn-sm">Save</a>+ <a wicket:id="cancel" class="btn btn-default btn-sm">Cancel</a>+ </div>+ </form>+ </wicket:fragment></wicket:extend>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.javaindex 2815483d5f..f5eaf8d805 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.java@@ -10,6 +10,7 @@ import java.util.HashSet;import java.util.List;import java.util.Map;import java.util.Set;+import java.util.stream.Collectors;import javax.annotation.Nullable;import javax.persistence.EntityNotFoundException;@@ -61,6 +62,7 @@ import io.onedev.server.manager.VisitManager;import io.onedev.server.model.Issue;import io.onedev.server.model.IssueVote;import io.onedev.server.model.IssueWatch;+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.IssueField;@@ -72,6 +74,8 @@ import io.onedev.server.model.support.issue.workflow.TransitionSpec;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.inputspec.InputContext;import io.onedev.server.util.inputspec.InputSpec;+import io.onedev.server.util.inputspec.choiceinput.ChoiceInput;+import io.onedev.server.util.inputspec.dateinput.DateInput;import io.onedev.server.web.component.IssueStateLabel;import io.onedev.server.web.component.avatar.AvatarLink;import io.onedev.server.web.component.comment.CommentInput;@@ -80,6 +84,7 @@ import io.onedev.server.web.component.link.ViewStateAwarePageLink;import io.onedev.server.web.component.markdown.AttachmentSupport;import io.onedev.server.web.component.modal.ModalLink;import io.onedev.server.web.component.modal.ModalPanel;+import io.onedev.server.web.component.stringchoice.StringSingleChoice;import io.onedev.server.web.component.tabbable.PageTab;import io.onedev.server.web.component.tabbable.PageTabLink;import io.onedev.server.web.component.tabbable.Tab;@@ -93,10 +98,12 @@ import io.onedev.server.web.page.project.ProjectPage;import io.onedev.server.web.page.project.issues.fieldvalues.FieldValuesPanel;import io.onedev.server.web.page.project.issues.issuedetail.activities.IssueActivitiesPage;import io.onedev.server.web.page.project.issues.issuelist.IssueListPage;+import io.onedev.server.web.page.project.issues.milestones.MilestoneDetailPage;import io.onedev.server.web.page.project.issues.newissue.NewIssuePage;import io.onedev.server.web.page.security.LoginPage;import io.onedev.server.web.util.ConfirmOnClick;import io.onedev.server.web.util.QueryPosition;+import io.onedev.utils.StringUtils;@SuppressWarnings("serial")public abstract class IssueDetailPage extends ProjectPage implements InputContext {@@ -316,9 +323,10 @@ public abstract class IssueDetailPage extends ProjectPage implements InputContexif (toStateSpec == null)throw new OneException("Unable to find state spec: " + transition.getToState());promptedFields.addAll(toStateSpec.getFields());-++ String prevState = getIssue().getState();getIssue().setState(transition.getToState());- getIssueChangeManager().changeState(getIssue(), fieldBean, comment, prevFields, promptedFields);+ getIssueChangeManager().changeState(getIssue(), fieldBean, comment, prevState, prevFields, promptedFields);setResponsePage(IssueActivitiesPage.class, IssueActivitiesPage.paramsOf(getIssue(), position));}@@ -348,8 +356,32 @@ public abstract class IssueDetailPage extends ProjectPage implements InputContex}add(transitionsView);++ List<String> criterias = new ArrayList<>();+ if (getIssue().getMilestone() != null)+ criterias.add(IssueQuery.quote(Issue.MILESTONE) + " is " + IssueQuery.quote(getIssue().getMilestoneName()));+ for (Map.Entry<String, IssueField> entry: getIssue().getEffectiveFields().entrySet()) {+ List<String> strings = entry.getValue().getValues();+ if (strings.isEmpty()) {+ criterias.add(IssueQuery.quote(entry.getKey()) + " is empty");+ } else {+ InputSpec field = getProject().getIssueWorkflow().getFieldSpec(entry.getKey());+ if (field instanceof ChoiceInput && ((ChoiceInput)field).isAllowMultiple()) {+ for (String string: strings)+ criterias.add(IssueQuery.quote(entry.getKey()) + " contains " + IssueQuery.quote(string));+ } else if (!(field instanceof DateInput)) {+ criterias.add(IssueQuery.quote(entry.getKey()) + " is " + IssueQuery.quote(strings.iterator().next()));+ }+ }+ }++ String query;+ if (!criterias.isEmpty())+ query = StringUtils.join(criterias, " and ");+ else+ query = null;- add(new BookmarkablePageLink<Void>("newIssue", NewIssuePage.class, NewIssuePage.paramsOf(getProject())) {+ add(new BookmarkablePageLink<Void>("newIssue", NewIssuePage.class, NewIssuePage.paramsOf(getProject(), query)) {@Overrideprotected void onConfigure() {@@ -412,6 +444,7 @@ public abstract class IssueDetailPage extends ProjectPage implements InputContexadd(newNavContainer());add(newFieldsContainer());+ add(newMilestoneContainer());add(newVotesContainer());add(newWatchesContainer());@@ -452,7 +485,7 @@ public abstract class IssueDetailPage extends ProjectPage implements InputContexIssueQuery query = IssueQuery.parse(getProject(), position.getQuery(), true);int count = position.getCount();int offset = position.getOffset() - 1;- List<Issue> issues = getIssueManager().query(query, offset, 1);+ List<Issue> issues = getIssueManager().query(getProject(), query, offset, 1);if (!issues.isEmpty()) {if (!query.getCriteria().matches(getIssue()))count--;@@ -490,7 +523,7 @@ public abstract class IssueDetailPage extends ProjectPage implements InputContexelsecount--;- List<Issue> issues = getIssueManager().query(query, offset, 1);+ List<Issue> issues = getIssueManager().query(getProject(), query, offset, 1);if (!issues.isEmpty()) {QueryPosition nextPosition = new QueryPosition(position.getQuery(), count, offset);PageParameters params = IssueDetailPage.paramsOf(issues.get(0), nextPosition);@@ -663,6 +696,91 @@ public abstract class IssueDetailPage extends ProjectPage implements InputContexreturn fieldsContainer;}+ private Component newMilestoneContainer() {+ Fragment fragment = new Fragment("milestone", "milestoneViewFrag", this);+ if (getIssue().getMilestone() != null) {+ Link<Void> link = new BookmarkablePageLink<Void>("link", MilestoneDetailPage.class, MilestoneDetailPage.paramsOf(getIssue().getMilestone(), null));+ link.add(new Label("label", getIssue().getMilestone().getName()));+ fragment.add(link);+ } else {+ WebMarkupContainer link = new WebMarkupContainer("link") {++ @Override+ protected void onComponentTag(ComponentTag tag) {+ super.onComponentTag(tag);+ tag.setName("span");+ }++ };+ link.add(new Label("label", "<i>Unspecified</i>").setEscapeModelStrings(false));+ fragment.add(link);+ }++ fragment.add(new AjaxLink<Void>("edit") {++ private String milestoneName = getIssue().getMilestoneName();++ @Override+ public void onClick(AjaxRequestTarget target) {+ Fragment fragment = new Fragment("milestone", "milestoneEditFrag", IssueDetailPage.this);+ Form<?> form = new Form<Void>("form");++ List<String> milestones = getProject().getMilestones().stream().map(it->it.getName()).collect(Collectors.toList());+ StringSingleChoice choice = new StringSingleChoice("milestone",+ new PropertyModel<String>(this, "milestoneName"), milestones) {++ @Override+ protected void onInitialize() {+ super.onInitialize();+ getSettings().setPlaceholder("Unspecified");+ }++ };+ choice.setRequired(false);+ form.add(choice);++ form.add(new AjaxButton("save") {++ @Override+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {+ super.onSubmit(target, form);+ String prevMilestoneName = getIssue().getMilestoneName();+ Milestone milestone = getProject().getMilestone(milestoneName);+ getIssue().setMilestone(milestone);+ getIssueChangeManager().changeMilestone(getIssue(), prevMilestoneName);+ Component container = newMilestoneContainer();+ getPage().replace(container);+ target.add(container);+ }++ });+ form.add(new AjaxLink<Void>("cancel") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ Component container = newMilestoneContainer();+ getPage().replace(container);+ target.add(container);+ }++ });+ fragment.add(form);+ fragment.setOutputMarkupId(true);+ getPage().replace(fragment);+ target.add(fragment);+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(SecurityUtils.canModify(getIssue()));+ }++ });+ fragment.setOutputMarkupId(true);+ return fragment;+ }+private Component newVotesContainer() {WebMarkupContainer votesContainer = new WebMarkupContainer("votes");votesContainer.setOutputMarkupId(true);diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/IssueActivitiesPage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/IssueActivitiesPage.javaindex 062951ddbf..fcc515ef46 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/IssueActivitiesPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/IssueActivitiesPage.java@@ -61,7 +61,7 @@ public class IssueActivitiesPage extends IssueDetailPage {for (IssueComment comment: getIssue().getComments())activities.add(new CommentedActivity(comment));- for (IssueChange change: getIssue().getEdits())+ for (IssueChange change: getIssue().getChanges())activities.add(new ChangedActivity(change));activities.sort((o1, o2) -> {diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/issue-detail.css b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/issue-detail.cssindex 873111a55e..17c8fae294 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/issue-detail.css+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/issue-detail.css@@ -12,7 +12,8 @@position: relative;}#issue-detail>.main>.title a {- color: #999;+ color: #666;+ margin-left: 8px;}#issue-detail>.main>.title input[type=text] {width: 600px;@@ -91,6 +92,7 @@#issue-detail>.side .fields td {padding-bottom: 10px;vertical-align: middle;+ vertical-align: top;}#issue-detail>.side .fields tr:last-child td {padding-bottom: 0;@@ -98,7 +100,7 @@#issue-detail>.side .fields .name {line-height: 20px;white-space: nowrap;- padding-right: 20px;+ padding: 3px 20px 3px 0;}#issue-detail>.side .fields .values .value>div, #issue-detail>.side .fields .values i {display: table-cell;@@ -109,4 +111,9 @@display: block;margin-top: 12px;}+#issue-detail>.side a.action {+ margin-top: 0;+ margin-left: 8px;+ color: #666;+}diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/IssueListPage.html b/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/IssueListPage.htmlindex d472130e1d..5c29ca1bba 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/IssueListPage.html+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/IssueListPage.html@@ -31,67 +31,8 @@</div></div></div>- <div class="main">- <div class="head">- <form wicket:id="query">- <div class="input-group no-autofocus">- <input wicket:id="input" spellcheck="false" autocomplete="off" class="form-control" placeholder="Query and order issues here"></input>- <span class="input-group-btn">- <button type="submit" class="btn btn-default" title="Query"><i class="fa fa-search"></i></button>- </span>- </div>- </form>- <div class="actions">- <a wicket:id="displayFields" class="btn btn-default display-fields" title="Custom fields to display"><i class="fa fa-list-ul"></i></a>- <a wicket:id="newIssue" class="btn btn-success open-new"><i class="fa fa-plus"></i> Open New</a>- </div>- </div>- <div wicket:id="body" class="body">- <div wicket:id="feedback"></div>- <div wicket:id="issues">- <div class="primary">- <div wicket:id="number" class="number"></div>- <div wicket:id="title" class="title"></div>- <div class="last-activity">- <a wicket:id="user"></a>- <span wicket:id="action"></span>- <span wicket:id="date"></span>- </div>- </div>- <div class="additional">- <div class="state"><div wicket:id="state"></div></div>- <div wicket:id="fields"></div>- <div class="votes-and-comments">- <span title="Votes"><i class="fa fa-thumbs-o-up"></i> <span wicket:id="votes" class="votes"></span></span>- <span title="Comments"><i class="fa fa-comments"></i> <span wicket:id="comments" class="comments"></span></span>- </div>- </div>- </div>- <div class="center"><ul wicket:id="issuesPageNav"></ul></div>- <div wicket:id="noIssues" class="no-records">No issues found</div>- </div>- </div>+ <div wicket:id="main" class="main"></div></div>- <wicket:fragment wicket:id="titleFrag">- <a wicket:id="link"><span wicket:id="label"></span></a>- </wicket:fragment>- <wicket:fragment wicket:id="fieldsFrag">- <form wicket:id="form" class="issue-table-fields leave-confirm no-autofocus">- <div class="modal-header">- <button wicket:id="close" type="button" class="close">×</button>- <h4 id="modal-title" class="modal-title">- Custom Fields to Display- </h4>- </div>- <div class="modal-body">- <div wicket:id="editor"></div>- </div>- <div class="modal-footer clearfix">- <input wicket:id="save" type="submit" class="dirty-aware btn btn-primary" value="Save"></input>- <a wicket:id="cancel" class="btn btn-default">Cancel</a>- </div>- </form>- </wicket:fragment><wicket:fragment wicket:id="saveQueryFrag"><form wicket:id="form" class="save-issue-query"><div class="modal-header">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 0ec4055456..334d6c9bb2 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@@ -1,69 +1,47 @@package io.onedev.server.web.page.project.issues.issuelist;import java.util.ArrayList;-import java.util.Date;import java.util.HashSet;-import java.util.Iterator;import java.util.List;import java.util.Map;import java.util.Set;-import java.util.concurrent.atomic.AtomicReference;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.ajax.form.AjaxFormComponentUpdatingBehavior;import org.apache.wicket.ajax.markup.html.AjaxLink;import org.apache.wicket.ajax.markup.html.form.AjaxButton;-import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.markup.ComponentTag;+import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.IHeaderResponse;-import org.apache.wicket.markup.head.JavaScriptHeaderItem;-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.form.Form;-import org.apache.wicket.markup.html.form.TextField;import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.markup.html.list.ListItem;import org.apache.wicket.markup.html.list.ListView;import org.apache.wicket.markup.html.panel.Fragment;-import org.apache.wicket.markup.repeater.Item;-import org.apache.wicket.markup.repeater.RepeatingView;-import org.apache.wicket.markup.repeater.data.DataView;-import org.apache.wicket.markup.repeater.data.IDataProvider;-import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.Model;import org.apache.wicket.model.PropertyModel;import org.apache.wicket.request.cycle.RequestCycle;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 io.onedev.server.OneDev;-import io.onedev.server.manager.IssueManager;import io.onedev.server.manager.IssueQuerySettingManager;import io.onedev.server.manager.ProjectManager;-import io.onedev.server.model.Issue;import io.onedev.server.model.IssueQuerySetting;import io.onedev.server.model.Project;-import io.onedev.server.model.User;-import io.onedev.server.model.support.issue.FieldsEditBean;-import io.onedev.server.model.support.issue.IssueField;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.util.DateUtils;-import io.onedev.server.web.WebConstants;-import io.onedev.server.web.component.IssueStateLabel;-import io.onedev.server.web.component.datatable.HistoryAwarePagingNavigator;-import io.onedev.server.web.component.link.UserLink;+import io.onedev.server.web.component.issuelist.IssueListPanel;import io.onedev.server.web.component.modal.ModalLink;import io.onedev.server.web.component.modal.ModalPanel;import io.onedev.server.web.component.tabbable.AjaxActionTab;@@ -73,19 +51,13 @@ import io.onedev.server.web.component.watchstatus.WatchStatusLink;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;import io.onedev.server.web.page.project.issues.IssuesPage;-import io.onedev.server.web.page.project.issues.fieldvalues.FieldValuesPanel;-import io.onedev.server.web.page.project.issues.issuedetail.activities.IssueActivitiesPage;-import io.onedev.server.web.page.project.issues.newissue.NewIssuePage;import io.onedev.server.web.util.PagingHistorySupport;-import io.onedev.server.web.util.QueryPosition;import io.onedev.server.web.util.ajaxlistener.ConfirmLeaveListener;import io.onedev.utils.StringUtils;@SuppressWarnings("serial")public class IssueListPage extends IssuesPage {- private static final Logger logger = LoggerFactory.getLogger(IssueListPage.class);-private static final String PARAM_CURRENT_PAGE = "currentPage";private static final String PARAM_QUERY = "query";@@ -99,10 +71,6 @@ public class IssueListPage extends IssuesPage {query = params.get(PARAM_QUERY).toOptionalString();}- private IssueManager getIssueManager() {- return OneDev.getInstance(IssueManager.class);- }-private IssueQuerySettingManager getIssueQuerySettingManager() {return OneDev.getInstance(IssueQuerySettingManager.class);}@@ -503,258 +471,58 @@ public class IssueListPage extends IssuesPage {add(newSideContainer());- TextField<String> input = new TextField<String>("input", new PropertyModel<String>(this, "query"));- input.add(new IssueQueryBehavior(projectModel));-- if (getLoginUser() != null) {- input.add(new AjaxFormComponentUpdatingBehavior("input"){-- @Override- protected void onUpdate(AjaxRequestTarget target) {- target.add(querySave);- }-- });- }- Form<?> form = new Form<Void>("query") {-- @Override- protected void onSubmit() {- super.onSubmit();- setResponsePage(IssueListPage.class, IssueListPage.paramsOf(getProject(), query));- }-- };- form.add(input);- add(form);-- add(new ModalLink("displayFields") {-- @Override- protected Component newContent(String id, ModalPanel modal) {- Fragment fragment = new Fragment(id, "fieldsFrag", IssueListPage.this);-- FieldsEditBean bean = new FieldsEditBean();- bean.setFields(getProject().getIssueListFields());- Form<?> form = new Form<Void>("form") {-- @Override- protected void onError() {- super.onError();- RequestCycle.get().find(AjaxRequestTarget.class).add(this);- }-- };- form.add(BeanContext.editBean("editor", bean));-- form.add(new AjaxLink<Void>("close") {-- @Override- public void onClick(AjaxRequestTarget target) {- modal.close();- }-- });-- form.add(new AjaxButton("save") {-- @Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);- getProject().setIssueListFields((ArrayList<String>) bean.getFields());- OneDev.getInstance(ProjectManager.class).save(getProject());- setResponsePage(IssueListPage.this);- }-- });-- form.add(new AjaxLink<Void>("cancel") {-- @Override- public void onClick(AjaxRequestTarget target) {- modal.close();- }-- });- form.setOutputMarkupId(true);- fragment.add(form);- return fragment;- }-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(SecurityUtils.canManage(getProject()));- }-- });-- add(new BookmarkablePageLink<Void>("newIssue", NewIssuePage.class, NewIssuePage.paramsOf(getProject())) {+ PagingHistorySupport pagingHistorySupport = new PagingHistorySupport() {@Override- protected void onConfigure() {- super.onConfigure();- setVisible(SecurityUtils.canRead(getProject()));+ public PageParameters newPageParameters(int currentPage) {+ PageParameters params = paramsOf(getProject(), query);+ params.add(PARAM_CURRENT_PAGE, currentPage+1);+ return params;}- });-- AtomicReference<IssueQuery> parsedQuery = new AtomicReference<>(null);- try {- parsedQuery.set(IssueQuery.parse(getProject(), query, true));- if (getLoginUser() == null && parsedQuery.get().needsLogin()) {- form.error("Please login to perform this query");- parsedQuery.set(null);- }- } catch (Exception e) {- logger.error("Error parsing issue query: " + query, e);- if (StringUtils.isNotBlank(e.getMessage()))- form.error(e.getMessage());- else- form.error("Malformed issue query");- }-- int count;- if (parsedQuery.get() != null)- count = getIssueManager().count(parsedQuery.get().getCriteria());- else- count = 0;-- IDataProvider<Issue> dataProvider = new IDataProvider<Issue>() {-@Override- public void detach() {- }-- @Override- public Iterator<? extends Issue> iterator(long first, long count) {- return getIssueManager().query(parsedQuery.get(), (int)first, (int)count).iterator();- }-- @Override- public long size() {- return count;- }-- @Override- public IModel<Issue> model(Issue object) {- Long issueId = object.getId();- return new LoadableDetachableModel<Issue>() {-- @Override- protected Issue load() {- return OneDev.getInstance(IssueManager.class).load(issueId);- }-- };+ public int getCurrentPage() {+ return getPageParameters().get(PARAM_CURRENT_PAGE).toInt(1)-1;}};- WebMarkupContainer body = new WebMarkupContainer("body");-- body.add(new NotificationPanel("feedback", form));-- DataView<Issue> issuesView = new DataView<Issue>("issues", dataProvider) {+ add(new IssueListPanel("main", new PropertyModel<String>(this, "query")) {@Override- protected void populateItem(Item<Issue> item) {- Issue issue = item.getModelObject();- item.add(new Label("number", "#" + issue.getNumber()));- Fragment titleFrag = new Fragment("title", "titleFrag", IssueListPage.this);- QueryPosition position = new QueryPosition(query, count, (int)getCurrentPage() * WebConstants.PAGE_SIZE + item.getIndex());- Link<Void> link = new BookmarkablePageLink<Void>("link", IssueActivitiesPage.class,- IssueActivitiesPage.paramsOf(issue, position));- link.add(new Label("label", issue.getTitle()));- titleFrag.add(link);- item.add(titleFrag);-- item.add(new UserLink("user",- User.getForDisplay(issue.getLastActivity().getUser(), issue.getLastActivity().getUserName())));- item.add(new Label("action", issue.getLastActivity().getAction()));- item.add(new Label("date", DateUtils.formatAge(issue.getLastActivity().getDate())));-- item.add(new IssueStateLabel("state", item.getModel()));-- RepeatingView fieldsView = new RepeatingView("fields");- for (String fieldName: getProject().getIssueListFields()) {- fieldsView.add(new FieldValuesPanel(fieldsView.newChildId()) {-- @Override- protected Issue getIssue() {- return item.getModelObject();- }-- @Override- protected IssueField getField() {- return item.getModelObject().getEffectiveFields().get(fieldName);- }-- }.add(AttributeAppender.append("title", fieldName)));- }-- item.add(fieldsView);- item.add(new Label("votes", issue.getNumOfVotes()));- item.add(new Label("comments", issue.getNumOfComments()));-- Date lastActivityDate;- if (issue.getLastActivity() != null)- lastActivityDate = issue.getLastActivity().getDate();- else- lastActivityDate = issue.getSubmitDate();- item.add(AttributeAppender.append("class",- issue.isVisitedAfter(lastActivityDate)?"issue":"issue new"));+ protected Project getProject() {+ return IssueListPage.this.getProject();}-- };- issuesView.setItemsPerPage(WebConstants.PAGE_SIZE);-- PagingHistorySupport pagingHistorySupport = new PagingHistorySupport() {@Override- public PageParameters newPageParameters(int currentPage) {- PageParameters params = paramsOf(getProject(), query);- params.add(PARAM_CURRENT_PAGE, currentPage+1);- return params;+ protected IssueCriteria getBaseCriteria() {+ return null;}-+@Override- public int getCurrentPage() {- return getPageParameters().get(PARAM_CURRENT_PAGE).toInt(1)-1;+ protected PagingHistorySupport getPagingHistorySupport() {+ return pagingHistorySupport;}-- };-- issuesView.setCurrentPage(pagingHistorySupport.getCurrentPage());-- body.add(issuesView);-- body.add(new HistoryAwarePagingNavigator("issuesPageNav", issuesView, pagingHistorySupport) {@Override- protected void onConfigure() {- super.onConfigure();- setVisible(issuesView.getPageCount() > 1);+ protected void onQueryUpdated(AjaxRequestTarget target) {+ setResponsePage(IssueListPage.class, paramsOf(getProject(), query));}-- });- body.add(new WebMarkupContainer("noIssues") {@Override- protected void onConfigure() {- super.onConfigure();- setVisible(parsedQuery.get() != null && dataProvider.size() == 0);+ protected void onQueryUpdating(AjaxRequestTarget target) {+ if (getLoginUser() != null)+ target.add(querySave);}});- add(body);+}@Overridepublic void renderHead(IHeaderResponse response) {super.renderHead(response);- response.render(JavaScriptHeaderItem.forReference(new IssueListResourceReference()));- response.render(OnDomReadyHeaderItem.forScript("onedev.server.issueList.onDomReady();"));+ response.render(CssHeaderItem.forReference(new IssueListResourceReference()));}public static PageParameters paramsOf(Project project, @Nullable String query) {diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/IssueListResourceReference.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/IssueListResourceReference.javaindex 5201839a0b..04963528b8 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/IssueListResourceReference.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/IssueListResourceReference.java@@ -1,29 +1,13 @@package io.onedev.server.web.page.project.issues.issuelist;-import java.util.List;--import org.apache.wicket.markup.head.CssHeaderItem;-import org.apache.wicket.markup.head.HeaderItem;-import org.apache.wicket.markup.head.JavaScriptHeaderItem;--import io.onedev.server.web.asset.perfectscrollbar.PerfectScrollbarResourceReference;import io.onedev.server.web.page.base.BaseDependentCssResourceReference;-import io.onedev.server.web.page.base.BaseDependentResourceReference;-public class IssueListResourceReference extends BaseDependentResourceReference {+public class IssueListResourceReference extends BaseDependentCssResourceReference {private static final long serialVersionUID = 1L;public IssueListResourceReference() {- super(IssueListResourceReference.class, "issue-list.js");- }-- @Override- public List<HeaderItem> getDependencies() {- List<HeaderItem> dependencies = super.getDependencies();- dependencies.add(JavaScriptHeaderItem.forReference(new PerfectScrollbarResourceReference()));- dependencies.add(CssHeaderItem.forReference(new BaseDependentCssResourceReference(IssueListResourceReference.class, "issue-list.css")));- return dependencies;+ super(IssueListResourceReference.class, "issue-list.css");}}diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/issue-list.css b/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/issue-list.cssindex 61e4c4bc6f..86164ae1d1 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/issue-list.css+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/issue-list.css@@ -49,92 +49,4 @@#issue-list>.main {padding-left: 20px;}-#issue-list>.main>.head {- position: relative;- margin-bottom: 20px;-}-#issue-list>.main>.head>form {- margin-right: 200px;-}-#issue-list>.main>.head>.actions {- position: absolute;- right: 0;- top: 0;-}-#issue-list .issue {- border-bottom: 2px solid #DDD;- margin-bottom: 12px;-}-#issue-list .issue .primary {- display: table;- table-layout: fixed;- width: 100%;-}-#issue-list .issue .primary>div {- display: table-cell;- white-space: nowrap;- overflow: hidden;- text-overflow: ellipsis;- padding-right: 8px;-}-#issue-list .issue .primary .number {- width: 75px;- font-size: 16px;- font-weight: bold;-}-#issue-list .issue .primary .title a {- font-size: 16px;- font-weight: bold;- color: #444;-}-#issue-list .issue .primary .last-activity {- text-align: right;- width: 300px;- padding-right: 0;-}-#issue-list .issue .additional {- display: table;- table-layout: fixed;- width: 100%;-}-#issue-list .issue .additional>div {- display: table-cell;- padding: 8px 8px 8px 0;-}-#issue-list .issue .additional .state>div {- color: white;-}-#issue-list .issue .additional .field-values>.value {- overflow: hidden;- white-space: nowrap;- text-overflow: ellipsis;-}-#issue-list .issue .additional .field-values>.white.value {- color: white;-}--#issue-list .issue .additional .state>div,-#issue-list .issue .additional .field-values .value>div,-#issue-list .issue .additional .field-values i {- display: table-cell;- padding: 3px 6px;- border-radius: 3px;-}-#issue-list .issue .additional .state>div {- font-weight: bold;-}-#issue-list .issue .additional>.votes-and-comments {- text-align: right;- padding-right: 0;-}-#issue-list .issue .additional>.votes-and-comments>span:first-child {- margin-right: 8px;-}-#issue-list .issue {- border-left: 4px solid white;- padding-left: 8px;-}-#issue-list .new.issue {- border-left-color: #4667EE;-}diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/issue-list.js b/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/issue-list.jsdeleted file mode 100644index eacddade45..0000000000--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/issue-list.js+++ /dev/null@@ -1,8 +0,0 @@-onedev.server.issueList = {- onDomReady: function() {- var ps = new PerfectScrollbar($("#issue-list>.side")[0]);- $(window).resize(function() {- ps.update();- });- }-}diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/ActionPanel.html b/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/ActionPanel.htmlnew file mode 100644index 0000000000..80ebadb4b0--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/ActionPanel.html@@ -0,0 +1,42 @@+<wicket:panel>+ <div class="actions">+ <a wicket:id="reopen" title="Reopen milestone"><i class="fa fa-repeat"></i> reopen</a>+ <a wicket:id="close" title="Close milestone"><i class="fa fa-check"></i> close</a>+ <a wicket:id="edit" title="Edit milestone"><i class="fa fa-pencil"></i> edit</a>+ <a wicket:id="delete" title="Delete milestone"><i class="fa fa-trash"></i> delete</a>+ </div>+ <wicket:fragment wicket:id="confirmCloseFrag">+ <form wicket:id="form" class="confirm-close-milestone no-autofocus">+ <div class="modal-header">+ <button wicket:id="close" type="button" class="close">×</button>+ <h4 wicket:id="title" id="modal-title" class="modal-title">+ Confirm Close Milestone+ </h4>+ </div>+ <div class="modal-body">+ <div wicket:id="editor"></div>+ </div>+ <div class="modal-footer clearfix">+ <input wicket:id="ok" type="submit" class="dirty-aware btn btn-primary" value="Ok"></input>+ <a wicket:id="cancel" class="btn btn-default">Cancel</a>+ </div>+ </form>+ </wicket:fragment>+ <wicket:fragment wicket:id="confirmDeleteFrag">+ <form wicket:id="form" class="confirm-delete-milestone no-autofocus">+ <div class="modal-header">+ <button wicket:id="close" type="button" class="close">×</button>+ <h4 wicket:id="title" id="modal-title" class="modal-title">+ Confirm Delete Milestone+ </h4>+ </div>+ <div class="modal-body">+ <div wicket:id="editor"></div>+ </div>+ <div class="modal-footer clearfix">+ <input wicket:id="ok" type="submit" class="dirty-aware btn btn-primary" value="Ok"></input>+ <a wicket:id="cancel" class="btn btn-default">Cancel</a>+ </div>+ </form>+ </wicket:fragment>+</wicket:panel>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/ActionPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/ActionPanel.javanew file mode 100644index 0000000000..1e452da960--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/ActionPanel.java@@ -0,0 +1,209 @@+package io.onedev.server.web.page.project.issues.milestones;++import org.apache.wicket.Component;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.markup.html.AjaxLink;+import org.apache.wicket.ajax.markup.html.form.AjaxButton;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.form.Form;+import org.apache.wicket.markup.html.link.BookmarkablePageLink;+import org.apache.wicket.markup.html.panel.Fragment;+import org.apache.wicket.markup.html.panel.GenericPanel;+import org.apache.wicket.model.IModel;++import com.google.common.base.Preconditions;+import com.google.common.collect.Sets;++import io.onedev.server.OneDev;+import io.onedev.server.manager.MilestoneManager;+import io.onedev.server.model.Milestone;+import io.onedev.server.web.component.modal.ModalPanel;+import io.onedev.server.web.editable.BeanContext;++@SuppressWarnings("serial")+abstract class ActionPanel extends GenericPanel<Milestone> {++ public ActionPanel(String id, IModel<Milestone> model) {+ super(id, model);+ }++ private Milestone getMilestone() {+ return getModelObject();+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ add(new AjaxLink<Void>("reopen") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ Milestone milestone = getMilestone();+ milestone.setClosed(false);+ OneDev.getInstance(MilestoneManager.class).save(milestone);+ target.add(ActionPanel.this);+ onUpdated(target);+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(getMilestone().isClosed());+ }++ });++ add(new AjaxLink<Void>("close") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ new ModalPanel(target) {++ @Override+ protected Component newContent(String id) {+ Fragment fragment = new Fragment(id, "confirmCloseFrag", ActionPanel.this);+ Form<?> form = new Form<Void>("form");+ form.setOutputMarkupId(true);++ form.add(new Label("title", "Confirm Closing Milestone '" + getMilestone().getName() + "'"));++ MilestoneCloseOption option = new MilestoneCloseOption();+ option.setMilestoneToClose(getMilestone().getName());+ form.add(BeanContext.editBean("editor", option, Sets.newHashSet("milestoneToClose")));++ form.add(new AjaxLink<Void>("close") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ close();+ }++ });+ form.add(new AjaxLink<Void>("cancel") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ close();+ }++ });+ form.add(new AjaxButton("ok") {++ @Override+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {+ super.onSubmit(target, form);+ MilestoneManager milestoneManager = OneDev.getInstance(MilestoneManager.class);+ if (option.isMoveOpenIssuesToAnotherMilestone()) {+ Milestone newMilestone = milestoneManager.find(getMilestone().getProject(), option.getNewMilestone());+ Preconditions.checkNotNull(newMilestone);+ milestoneManager.close(getMilestone(), newMilestone);+ } else {+ milestoneManager.close(getMilestone(), null);+ }+ target.add(ActionPanel.this);+ close();+ onUpdated(target);+ }++ @Override+ protected void onError(AjaxRequestTarget target, Form<?> form) {+ super.onError(target, form);+ target.add(form);+ }++ });+ fragment.add(form);++ return fragment;+ }++ };+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(!getMilestone().isClosed());+ }++ });++ add(new BookmarkablePageLink<Void>("edit", MilestoneEditPage.class,+ MilestoneEditPage.paramsOf(getMilestone())));++ add(new AjaxLink<Void>("delete") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ new ModalPanel(target) {++ @Override+ protected Component newContent(String id) {+ Fragment fragment = new Fragment(id, "confirmDeleteFrag", ActionPanel.this);+ Form<?> form = new Form<Void>("form");+ form.setOutputMarkupId(true);++ form.add(new Label("title", "Confirm Deleting Milestone '" + getMilestone().getName() + "'"));++ MilestoneDeleteOption option = new MilestoneDeleteOption();+ option.setMilestoneToDelete(getMilestone().getName());+ form.add(BeanContext.editBean("editor", option, Sets.newHashSet("milestoneToDelete")));++ form.add(new AjaxLink<Void>("close") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ close();+ }++ });+ form.add(new AjaxLink<Void>("cancel") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ close();+ }++ });+ form.add(new AjaxButton("ok") {++ @Override+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {+ super.onSubmit(target, form);+ MilestoneManager milestoneManager = OneDev.getInstance(MilestoneManager.class);+ if (option.isMoveIssuesToAnotherMilestone()) {+ Milestone newMilestone = milestoneManager.find(getMilestone().getProject(), option.getNewMilestone());+ Preconditions.checkNotNull(newMilestone);+ milestoneManager.delete(getMilestone(), newMilestone);+ } else {+ milestoneManager.delete(getMilestone(), null);+ }+ target.add(ActionPanel.this);+ close();+ onDeleted(target);+ }++ @Override+ protected void onError(AjaxRequestTarget target, Form<?> form) {+ super.onError(target, form);+ target.add(form);+ }++ });+ fragment.add(form);++ return fragment;+ }+ };+ }++ });+ setOutputMarkupId(true);+ }++ protected abstract void onDeleted(AjaxRequestTarget target);++ protected abstract void onUpdated(AjaxRequestTarget target);++}diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/IssueStatsPanel.html b/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/IssueStatsPanel.htmlnew file mode 100644index 0000000000..fe8d053742--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/IssueStatsPanel.html@@ -0,0 +1,11 @@+<wicket:panel>+ <div class="issue-stats clearfix">+ <div class="text">+ <a wicket:id="open"><span wicket:id="count"></span></a>+ <a wicket:id="closed"><span wicket:id="count"></span></a>+ </div >+ <div class="progress">+ <div wicket:id="progress" class="progress-bar progress-bar-success"></div>+ </div>+ </div>+</wicket:panel>\ No newline at end of filediff --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.javanew file mode 100644index 0000000000..6bcf7eb40d--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/IssueStatsPanel.java@@ -0,0 +1,82 @@+package io.onedev.server.web.page.project.issues.milestones;++import org.apache.wicket.behavior.AttributeAppender;+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;+import org.apache.wicket.markup.html.panel.GenericPanel;+import org.apache.wicket.model.IModel;++import io.onedev.server.model.Milestone;+import io.onedev.server.model.support.issue.query.IssueCriteria;++@SuppressWarnings("serial")+class IssueStatsPanel extends GenericPanel<Milestone> {++ public IssueStatsPanel(String id, IModel<Milestone> model) {+ super(id, model);+ }++ private Milestone getMilestone() {+ return getModelObject();+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ int progress;+ int totalIssues = getMilestone().getNumOfOpenIssues()+getMilestone().getNumOfClosedIssues();+ if (totalIssues != 0)+ progress = 100 * getMilestone().getNumOfClosedIssues() / totalIssues;+ else+ progress = 0;+ if (progress > 100)+ progress = 100;++ add(new WebMarkupContainer("progress").add(AttributeAppender.append("style", "width: " + progress + "%;")));++ IssueCriteria openCriteria = getMilestone().getProject().getIssueWorkflow().getStatesCriteria(false);+ 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 closedCriteria = getMilestone().getProject().getIssueWorkflow().getStatesCriteria(true);+ 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);+ }+ }++}diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneCloseOption.java b/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneCloseOption.javanew file mode 100644index 0000000000..f83d42e82b--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneCloseOption.java@@ -0,0 +1,76 @@+package io.onedev.server.web.page.project.issues.milestones;++import java.io.Serializable;+import java.util.ArrayList;+import java.util.List;++import org.hibernate.validator.constraints.NotEmpty;++import io.onedev.server.model.Milestone;+import io.onedev.server.util.OneContext;+import io.onedev.server.web.editable.annotation.ChoiceProvider;+import io.onedev.server.web.editable.annotation.Editable;+import io.onedev.server.web.editable.annotation.OmitName;+import io.onedev.server.web.editable.annotation.ShowCondition;+import io.onedev.server.web.page.project.ProjectPage;+import io.onedev.server.web.util.WicketUtils;++@Editable+public class MilestoneCloseOption implements Serializable {++ private static final long serialVersionUID = 1L;++ private boolean moveOpenIssuesToAnotherMilestone = true;++ private String milestoneToClose;++ private String newMilestone;++ @Editable(order=100)+ public String getMilestoneToClose() {+ return milestoneToClose;+ }++ public void setMilestoneToClose(String milestoneToClose) {+ this.milestoneToClose = milestoneToClose;+ }++ @Editable+ public boolean isMoveOpenIssuesToAnotherMilestone() {+ return moveOpenIssuesToAnotherMilestone;+ }++ public void setMoveOpenIssuesToAnotherMilestone(boolean moveOpenIssuesToAnotherMilestone) {+ this.moveOpenIssuesToAnotherMilestone = moveOpenIssuesToAnotherMilestone;+ }++ @Editable(order=200, name="Another Open Milestone")+ @ShowCondition("isNewMilestoneVisible")+ @ChoiceProvider("getNewMilestoneChoices")+ @OmitName+ @NotEmpty+ public String getNewMilestone() {+ return newMilestone;+ }++ public void setNewMilestone(String newMilestone) {+ this.newMilestone = newMilestone;+ }++ @SuppressWarnings("unused")+ private static boolean isNewMilestoneVisible() {+ return (Boolean) OneContext.get().getEditContext().getInputValue("moveOpenIssuesToAnotherMilestone");+ }++ @SuppressWarnings("unused")+ private static List<String> getNewMilestoneChoices() {+ List<String> choices = new ArrayList<>();+ ProjectPage page = (ProjectPage) WicketUtils.getPage();+ Object milestoneToDelete = OneContext.get().getEditContext().getInputValue("milestoneToClose");+ for (Milestone milestone: page.getProject().getMilestones()) {+ if (!milestone.isClosed() && !milestone.getName().equals(milestoneToDelete))+ choices.add(milestone.getName());+ }+ return choices;+ }+}diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneDeleteOption.java b/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneDeleteOption.javanew file mode 100644index 0000000000..02c624ee2d--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneDeleteOption.java@@ -0,0 +1,76 @@+package io.onedev.server.web.page.project.issues.milestones;++import java.io.Serializable;+import java.util.ArrayList;+import java.util.List;++import org.hibernate.validator.constraints.NotEmpty;++import io.onedev.server.model.Milestone;+import io.onedev.server.util.OneContext;+import io.onedev.server.web.editable.annotation.ChoiceProvider;+import io.onedev.server.web.editable.annotation.Editable;+import io.onedev.server.web.editable.annotation.OmitName;+import io.onedev.server.web.editable.annotation.ShowCondition;+import io.onedev.server.web.page.project.ProjectPage;+import io.onedev.server.web.util.WicketUtils;++@Editable+public class MilestoneDeleteOption implements Serializable {++ private static final long serialVersionUID = 1L;++ private boolean moveIssuesToAnotherMilestone = true;++ private String milestoneToDelete;++ private String newMilestone;++ @Editable+ public String getMilestoneToDelete() {+ return milestoneToDelete;+ }++ public void setMilestoneToDelete(String milestoneToDelete) {+ this.milestoneToDelete = milestoneToDelete;+ }++ @Editable(order=100)+ public boolean isMoveIssuesToAnotherMilestone() {+ return moveIssuesToAnotherMilestone;+ }++ public void setMoveIssuesToAnotherMilestone(boolean moveIssuesToAnotherMilestone) {+ this.moveIssuesToAnotherMilestone = moveIssuesToAnotherMilestone;+ }++ @Editable(order=200, name="Another Milestone")+ @ShowCondition("isNewMilestoneVisible")+ @ChoiceProvider("getNewMilestoneChoices")+ @OmitName+ @NotEmpty+ public String getNewMilestone() {+ return newMilestone;+ }++ public void setNewMilestone(String newMilestone) {+ this.newMilestone = newMilestone;+ }++ @SuppressWarnings("unused")+ private static boolean isNewMilestoneVisible() {+ return (Boolean) OneContext.get().getEditContext().getInputValue("moveIssuesToAnotherMilestone");+ }++ @SuppressWarnings("unused")+ private static List<String> getNewMilestoneChoices() {+ List<String> choices = new ArrayList<>();+ ProjectPage page = (ProjectPage) WicketUtils.getPage();+ Object milestoneToDelete = OneContext.get().getEditContext().getInputValue("milestoneToDelete");+ for (Milestone milestone: page.getProject().getMilestones()) {+ if (!milestone.getName().equals(milestoneToDelete))+ choices.add(milestone.getName());+ }+ return choices;+ }+}diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneDetailPage.html b/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneDetailPage.htmlnew file mode 100644index 0000000000..908234e209--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneDetailPage.html@@ -0,0 +1,13 @@+<wicket:extend>+ <div id="milestone-detail">+ <h4 class="title clearfix">+ <div wicket:id="status" class="status pull-left"></div>+ <div wicket:id="name" class="name pull-left"></div>+ <div wicket:id="due" class="due pull-left"></div>+ <div wicket:id="issueStats" class="issue-stats pull-left"></div>+ <div wicket:id="actions" class="actions pull-left"></div>+ </h4>+ <div wicket:id="description" class="description"></div>+ <div wicket:id="issues" class="issues"></div>+ </div>+</wicket:extend>\ No newline at end of filediff --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.javanew file mode 100644index 0000000000..509e599713--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneDetailPage.java@@ -0,0 +1,199 @@+package io.onedev.server.web.page.project.issues.milestones;++import javax.annotation.Nullable;++import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.behavior.AttributeAppender;+import org.apache.wicket.markup.head.CssHeaderItem;+import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.model.AbstractReadOnlyModel;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.LoadableDetachableModel;+import org.apache.wicket.model.PropertyModel;+import org.apache.wicket.request.mapper.parameter.PageParameters;++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.IssueQueryLexer;+import io.onedev.server.model.support.issue.query.MilestoneCriteria;+import io.onedev.server.security.SecurityUtils;+import io.onedev.server.util.DateUtils;+import io.onedev.server.web.component.MultilineLabel;+import io.onedev.server.web.component.issuelist.IssueListPanel;+import io.onedev.server.web.page.project.issues.IssuesPage;+import io.onedev.server.web.util.PagingHistorySupport;++@SuppressWarnings("serial")+public class MilestoneDetailPage extends IssuesPage {++ private static final String PARAM_MILESTONE = "milestone";++ private static final String PARAM_QUERY = "query";++ private static final String PARAM_CURRENT_PAGE = "currentPage";++ private final IModel<Milestone> milestoneModel;++ private String query;++ public MilestoneDetailPage(PageParameters params) {+ super(params);++ Long milestoneId = params.get(PARAM_MILESTONE).toLong();+ milestoneModel = new LoadableDetachableModel<Milestone>() {++ @Override+ protected Milestone load() {+ return OneDev.getInstance(MilestoneManager.class).load(milestoneId);+ }++ };++ query = params.get(PARAM_QUERY).toString();+ }++ private Milestone getMilestone() {+ return milestoneModel.getObject();+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ add(new Label("name", getMilestone().getName()));++ add(new Label("status", new LoadableDetachableModel<String>() {++ @Override+ protected String load() {+ return getMilestone().isClosed()? "Closed": "Open";+ }++ }).add(AttributeAppender.append("class", new AbstractReadOnlyModel<String>() {++ @Override+ public String getObject() {+ return "label label-" + (getMilestone().isClosed()? "default": "warning");+ }++ })));++ add(new Label("due", new LoadableDetachableModel<String>() {++ @Override+ protected String load() {+ return "Due " + DateUtils.formatDate(getMilestone().getDueDate());+ }++ }) {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(getMilestone().getDueDate() != null);+ }++ });++ add(new ActionPanel("actions", milestoneModel) {++ @Override+ protected void onDeleted(AjaxRequestTarget target) {+ setResponsePage(MilestoneDetailPage.class, MilestoneDetailPage.paramsOf(getMilestone(), query));+ }++ @Override+ protected void onUpdated(AjaxRequestTarget target) {+ setResponsePage(MilestoneDetailPage.class, MilestoneDetailPage.paramsOf(getMilestone(), query));+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(SecurityUtils.canManage(getProject()));+ }++ });++ add(new MultilineLabel("description", getMilestone().getDescription()) {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(getMilestone().getDescription() != null);+ }++ });++ add(new IssueStatsPanel("issueStats", milestoneModel));++ PagingHistorySupport pagingHistorySupport = new PagingHistorySupport() {++ @Override+ public PageParameters newPageParameters(int currentPage) {+ PageParameters params = paramsOf(getMilestone(), query);+ params.add(PARAM_CURRENT_PAGE, currentPage+1);+ return params;+ }++ @Override+ public int getCurrentPage() {+ return getPageParameters().get(PARAM_CURRENT_PAGE).toInt(1)-1;+ }++ };++ add(new IssueListPanel("issues", new PropertyModel<String>(this, "query")) {++ @Override+ protected Project getProject() {+ return MilestoneDetailPage.this.getProject();+ }++ @Override+ protected IssueCriteria getBaseCriteria() {+ return new MilestoneCriteria(getMilestone().getName(), IssueQueryLexer.Is);+ }++ @Override+ protected PagingHistorySupport getPagingHistorySupport() {+ return pagingHistorySupport;+ }++ @Override+ protected void onQueryUpdated(AjaxRequestTarget target) {+ setResponsePage(MilestoneDetailPage.class, MilestoneDetailPage.paramsOf(getMilestone(), query));+ }++ @Override+ protected void onQueryUpdating(AjaxRequestTarget target) {+ }++ });+ }++ @Override+ protected void onDetach() {+ milestoneModel.detach();+ super.onDetach();+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(CssHeaderItem.forReference(new MilestonesResourceReference()));+ }++ public static PageParameters paramsOf(Milestone milestone, @Nullable String query) {+ PageParameters params = paramsOf(milestone.getProject());+ params.add(PARAM_MILESTONE, milestone.getId());+ if (query != null)+ params.add(PARAM_QUERY, query);+ return params;+ }++}diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneEditPage.html b/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneEditPage.htmlnew file mode 100644index 0000000000..fe542779ed--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneEditPage.html@@ -0,0 +1,11 @@+<wicket:extend>+ <div id="milestone-edit">+ <div class="head"><h4>Edit Milestone</h4></div>+ <form wicket:id="form" class="leave-confirm">+ <div wicket:id="editor"></div>+ <div class="actions">+ <input type="submit" value="Ok" class="btn btn-primary"></input>+ </div>+ </form>+ </div>+</wicket:extend>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneEditPage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneEditPage.javanew file mode 100644index 0000000000..6e7cc98f3e--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneEditPage.java@@ -0,0 +1,93 @@+package io.onedev.server.web.page.project.issues.milestones;++import java.util.Date;++import org.apache.wicket.Session;+import org.apache.wicket.markup.head.CssHeaderItem;+import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.html.form.Form;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.LoadableDetachableModel;+import org.apache.wicket.request.mapper.parameter.PageParameters;++import io.onedev.server.OneDev;+import io.onedev.server.manager.MilestoneManager;+import io.onedev.server.model.Milestone;+import io.onedev.server.web.editable.BeanContext;+import io.onedev.server.web.editable.BeanEditor;+import io.onedev.server.web.editable.PathSegment;+import io.onedev.server.web.page.project.issues.IssuesPage;++@SuppressWarnings("serial")+public class MilestoneEditPage extends IssuesPage {++ private static final String PARAM_MILESTONE = "milestone";++ private final IModel<Milestone> milestoneModel;++ public MilestoneEditPage(PageParameters params) {+ super(params);++ Long milestoneId = params.get(PARAM_MILESTONE).toLong();+ milestoneModel = new LoadableDetachableModel<Milestone>() {++ @Override+ protected Milestone load() {+ return OneDev.getInstance(MilestoneManager.class).load(milestoneId);+ }++ };+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ Milestone milestone = milestoneModel.getObject();+ BeanEditor editor = BeanContext.editBean("editor", milestone);+ Form<?> form = new Form<Void>("form") {++ @Override+ protected void onSubmit() {+ super.onSubmit();++ MilestoneManager milestoneManager = OneDev.getInstance(MilestoneManager.class);+ Milestone milestoneWithSameName = milestoneManager.find(getProject(), milestone.getName());+ if (milestoneWithSameName != null && !milestoneWithSameName.equals(milestone)) {+ editor.getErrorContext(new PathSegment.Property("name"))+ .addError("This name has already been used by another milestone in the project");+ }+ if (!editor.hasErrors(true)){+ editor.getBeanDescriptor().copyProperties(milestone, milestoneModel.getObject());+ milestoneModel.getObject().setUpdateDate(new Date());+ milestoneManager.save(milestoneModel.getObject());+ Session.get().success("Milestone saved");+ setResponsePage(MilestoneDetailPage.class, MilestoneDetailPage.paramsOf(milestoneModel.getObject(), null));+ }++ }++ };+ form.add(editor);+ add(form);+ }++ @Override+ protected void onDetach() {+ milestoneModel.detach();+ super.onDetach();+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(CssHeaderItem.forReference(new MilestonesResourceReference()));+ }++ public static PageParameters paramsOf(Milestone milestone) {+ PageParameters params = paramsOf(milestone.getProject());+ params.add(PARAM_MILESTONE, milestone.getId());+ return params;+ }++}diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneListPage.html b/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneListPage.htmlnew file mode 100644index 0000000000..a1210664b5--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneListPage.html@@ -0,0 +1,24 @@+<wicket:extend>+ <div id="milestone-list">+ <div class="head clearfix">+ <div class="pull-left">+ <span class="btn-group">+ <a wicket:id="open" class="btn btn-default">Open</a>+ <a wicket:id="closed" class="btn btn-default">Closed</a>+ </span>+ </div>+ <div class="pull-left">+ <a wicket:id="sort" class="btn btn-default">Sort <i class="fa fa-caret-down"></i></a>+ </div>+ <div class="pull-right">+ <a wicket:id="newMilestone" class="btn btn-success"><i class="fa fa-plus"></i> New Milestone</a>+ </div>+ </div>+ <div class="body">+ <table wicket:id="milestones" class="table"></table>+ </div>+ </div>+ <wicket:fragment wicket:id="nameFrag">+ <a wicket:id="link"><span wicket:id="label"></span></a>+ </wicket:fragment>+</wicket:extend>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneListPage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneListPage.javanew file mode 100644index 0000000000..298739cbec--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneListPage.java@@ -0,0 +1,282 @@+package io.onedev.server.web.page.project.issues.milestones;++import java.util.ArrayList;+import java.util.Iterator;+import java.util.List;++import javax.annotation.Nullable;++import org.apache.wicket.Component;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.behavior.AttributeAppender;+import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;+import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;+import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;+import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;+import org.apache.wicket.markup.head.CssHeaderItem;+import org.apache.wicket.markup.head.IHeaderResponse;+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.Fragment;+import org.apache.wicket.markup.repeater.Item;+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.hibernate.criterion.Restrictions;++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.persistence.dao.Dao;+import io.onedev.server.persistence.dao.EntityCriteria;+import io.onedev.server.security.SecurityUtils;+import io.onedev.server.util.DateUtils;+import io.onedev.server.util.MilestoneSort;+import io.onedev.server.web.WebConstants;+import io.onedev.server.web.component.datatable.HistoryAwareDataTable;+import io.onedev.server.web.component.floating.FloatingPanel;+import io.onedev.server.web.component.menu.MenuItem;+import io.onedev.server.web.component.menu.MenuLink;+import io.onedev.server.web.page.project.issues.IssuesPage;+import io.onedev.server.web.util.PagingHistorySupport;++@SuppressWarnings("serial")+public class MilestoneListPage extends IssuesPage {++ private static final String PARAM_STATE = "state";++ private static final String PARAM_SORT = "sort";++ private static final String PARAM_CURRENT_PAGE = "currentPage";++ private final boolean closed;++ private final MilestoneSort sort;++ private Component milestonesTable;++ private EntityCriteria<Milestone> getCriteria(boolean closed) {+ EntityCriteria<Milestone> criteria = EntityCriteria.of(Milestone.class);+ criteria.add(Restrictions.eq("project", getProject()));+ criteria.add(Restrictions.eq("closed", closed));+ return criteria;+ }++ public MilestoneListPage(PageParameters params) {+ super(params);++ String state = params.get(PARAM_STATE).toString();+ if (state == null)+ closed = false;+ else+ closed = state.toLowerCase().equals("closed");++ String sortString = params.get(PARAM_SORT).toString();+ if (sortString != null)+ sort = MilestoneSort.valueOf(sortString.toUpperCase());+ else+ sort = MilestoneSort.RECENTLY_UPDATED;+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ Link<Void> openLink = new BookmarkablePageLink<Void>("open",+ MilestoneListPage.class, paramsOf(getProject(), false, sort));+ openLink.setOutputMarkupId(true);+ if (!closed)+ openLink.add(AttributeAppender.append("class", "active"));+ add(openLink);++ Link<Void> closeLink = new BookmarkablePageLink<Void>("closed",+ MilestoneListPage.class, paramsOf(getProject(), true, sort));+ closeLink.setOutputMarkupId(true);+ if (closed)+ closeLink.add(AttributeAppender.append("class", "active"));+ add(closeLink);++ add(new MenuLink("sort") {++ @Override+ protected List<MenuItem> getMenuItems(FloatingPanel dropdown) {+ List<MenuItem> menuItems = new ArrayList<>();+ for (MilestoneSort sort: MilestoneSort.values()) {+ menuItems.add(new MenuItem() {++ @Override+ public String getLabel() {+ return sort.toString();+ }++ @Override+ public WebMarkupContainer newLink(String id) {+ PageParameters params = paramsOf(getProject(), closed, sort);+ Link<Void> link = new BookmarkablePageLink<Void>(id, MilestoneListPage.class, params);+ link.add(AttributeAppender.append("class", "milestone-sort"));+ if (sort == MilestoneListPage.this.sort)+ link.add(AttributeAppender.append("class", "active"));+ return link;+ }++ });+ }+ return menuItems;+ }++ });++ add(new Link<Void>("newMilestone") {++ @Override+ public void onClick() {+ setResponsePage(NewMilestonePage.class, NewMilestonePage.paramsOf(getProject()));+ }++ });++ List<IColumn<Milestone, Void>> columns = new ArrayList<>();++ columns.add(new AbstractColumn<Milestone, Void>(Model.of("Name")) {++ @Override+ public void populateItem(Item<ICellPopulator<Milestone>> cellItem, String componentId,+ IModel<Milestone> rowModel) {+ Milestone milestone = rowModel.getObject();+ Fragment fragment = new Fragment(componentId, "nameFrag", MilestoneListPage.this);+ Link<Void> link = new BookmarkablePageLink<Void>("link", MilestoneDetailPage.class,+ MilestoneDetailPage.paramsOf(milestone, null));+ link.add(new Label("label", milestone.getName()));+ fragment.add(link);+ cellItem.add(fragment);+ }+ });++ columns.add(new AbstractColumn<Milestone, Void>(Model.of("Due Date")) {++ @Override+ public void populateItem(Item<ICellPopulator<Milestone>> cellItem, String componentId,+ IModel<Milestone> rowModel) {+ Milestone milestone = rowModel.getObject();+ if (milestone.getDueDate() != null)+ cellItem.add(new Label(componentId, DateUtils.formatDate(milestone.getDueDate())));+ else+ cellItem.add(new Label(componentId, "<i>Not specified</i>").setEscapeModelStrings(false));+ }+ });++ columns.add(new AbstractColumn<Milestone, Void>(Model.of("Issues")) {++ @Override+ public String getCssClass() {+ return "issues";+ }++ @Override+ public void populateItem(Item<ICellPopulator<Milestone>> cellItem, String componentId,+ IModel<Milestone> rowModel) {+ cellItem.add(new IssueStatsPanel(componentId, rowModel));+ }+ });++ if (SecurityUtils.canManage(getProject())) {+ columns.add(new AbstractColumn<Milestone, Void>(Model.of("Actions")) {++ @Override+ public String getCssClass() {+ return "actions";+ }++ @Override+ public void populateItem(Item<ICellPopulator<Milestone>> cellItem, String componentId,+ IModel<Milestone> rowModel) {+ cellItem.add(new ActionPanel(componentId, rowModel) {++ @Override+ protected void onUpdated(AjaxRequestTarget target) {+ target.add(milestonesTable);+ }++ @Override+ protected void onDeleted(AjaxRequestTarget target) {+ target.add(milestonesTable);+ }++ });+ }++ });+ }++ SortableDataProvider<Milestone, Void> dataProvider = new SortableDataProvider<Milestone, Void>() {++ @Override+ public Iterator<? extends Milestone> iterator(long first, long count) {+ EntityCriteria<Milestone> criteria = getCriteria(closed);+ criteria.addOrder(sort.getOrder());+ return OneDev.getInstance(Dao.class).findRange(criteria, (int)first, (int)count).iterator();+ }++ @Override+ public long size() {+ return OneDev.getInstance(Dao.class).count(getCriteria(closed));+ }++ @Override+ public IModel<Milestone> model(Milestone object) {+ Long id = object.getId();+ return new LoadableDetachableModel<Milestone>() {++ @Override+ protected Milestone load() {+ return OneDev.getInstance(MilestoneManager.class).load(id);+ }++ };+ }+ };++ PagingHistorySupport pagingHistorySupport = new PagingHistorySupport() {++ @Override+ public PageParameters newPageParameters(int currentPage) {+ PageParameters params = paramsOf(getProject(), closed, sort);+ params.add(PARAM_CURRENT_PAGE, currentPage+1);+ return params;+ }++ @Override+ public int getCurrentPage() {+ return getPageParameters().get(PARAM_CURRENT_PAGE).toInt(1)-1;+ }++ };++ add(milestonesTable = new HistoryAwareDataTable<Milestone, Void>("milestones", columns, dataProvider,+ WebConstants.PAGE_SIZE, pagingHistorySupport));+ milestonesTable.setOutputMarkupId(true);+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(CssHeaderItem.forReference(new MilestonesResourceReference()));+ }++ public static PageParameters paramsOf(Project project, boolean closed, @Nullable MilestoneSort sort) {+ PageParameters params = paramsOf(project);+ if (closed)+ params.add(PARAM_STATE, "closed");+ else+ params.add(PARAM_STATE, "open");++ if (sort != null)+ params.add(PARAM_SORT, sort.name().toLowerCase());+ return params;+ }++}diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestonesResourceReference.java b/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestonesResourceReference.javanew file mode 100644index 0000000000..191201e910--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestonesResourceReference.java@@ -0,0 +1,13 @@+package io.onedev.server.web.page.project.issues.milestones;++import io.onedev.server.web.page.base.BaseDependentCssResourceReference;++public class MilestonesResourceReference extends BaseDependentCssResourceReference {++ private static final long serialVersionUID = 1L;++ public MilestonesResourceReference() {+ super(MilestonesResourceReference.class, "milestones.css");+ }++}diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/NewMilestonePage.html b/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/NewMilestonePage.htmlnew file mode 100644index 0000000000..f2780447a4--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/NewMilestonePage.html@@ -0,0 +1,13 @@+<wicket:extend>+ <div id="new-milestone">+ <div class="head"><h4>New Milestone</h4></div>+ <div class="body">+ <form wicket:id="form" class="leave-confirm">+ <div wicket:id="editor"></div>+ <div class="actions">+ <input type="submit" value="Ok" class="btn btn-primary"></input>+ </div>+ </form>+ </div>+ </div>+</wicket:extend>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/NewMilestonePage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/NewMilestonePage.javanew file mode 100644index 0000000000..9e7633841e--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/NewMilestonePage.java@@ -0,0 +1,72 @@+package io.onedev.server.web.page.project.issues.milestones;++import java.util.Date;++import org.apache.wicket.Session;+import org.apache.wicket.markup.head.CssHeaderItem;+import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.html.form.Form;+import org.apache.wicket.request.mapper.parameter.PageParameters;++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.web.editable.BeanContext;+import io.onedev.server.web.editable.BeanEditor;+import io.onedev.server.web.editable.PathSegment;+import io.onedev.server.web.page.project.ProjectPage;+import io.onedev.server.web.page.project.issues.IssuesPage;++@SuppressWarnings("serial")+public class NewMilestonePage extends IssuesPage {++ public NewMilestonePage(PageParameters params) {+ super(params);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ Milestone milestone = new Milestone();+ milestone.setUpdateDate(new Date());++ BeanEditor editor = BeanContext.editBean("editor", milestone);+ Form<?> form = new Form<Void>("form") {++ @Override+ protected void onSubmit() {+ super.onSubmit();++ MilestoneManager milestoneManager = OneDev.getInstance(MilestoneManager.class);+ Milestone milestoneWithSameName = milestoneManager.find(getProject(), milestone.getName());+ if (milestoneWithSameName != null) {+ editor.getErrorContext(new PathSegment.Property("name"))+ .addError("This name has already been used by another milestone in the project");+ }+ if (!editor.hasErrors(true)){+ milestone.setProject(getProject());+ milestoneManager.save(milestone);+ Session.get().success("New milestone created");+ setResponsePage(MilestoneListPage.class, MilestoneListPage.paramsOf(getProject(), false, null));+ }++ }++ };+ form.add(editor);+ add(form);+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(CssHeaderItem.forReference(new MilestonesResourceReference()));+ }++ public static PageParameters paramsOf(Project project) {+ return ProjectPage.paramsOf(project);+ }++}diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/milestones.css b/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/milestones.cssnew file mode 100644index 0000000000..b7d5cc126f--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/milestones.css@@ -0,0 +1,50 @@+#milestone-list>.head {+ margin-bottom: 20px;+}+#milestone-list>.head>.pull-left {+ margin-right: 20px;+}+#milestone-list>.body tbody a {+ color: #444;+ margin-right: 8px;+}++.issue-stats .progress {+ float: left;+ width: 300px;+}+.issue-stats .text {+ float: left;+ margin-right: 20px;+}+.milestone-sort.active:before {+ font-family: "FontAwesome";+ content: "\f00c";+ position: absolute;+ left: 6px;+}+.confirm-close-milestone .control-label, .confirm-delete-milestone .control-label {+ font-weight: normal;+}+#new-milestone>.head, #milestone-edit>.head {+ margin-bottom: 20px;+}+#milestone-detail>* {+ margin-bottom: 20px;+}+#milestone-detail>.title>* {+ margin-right: 20px;+}+#milestone-detail>.title .due, #milestone-detail>.title a {+ font-weight: normal;+ font-size: 16px;+}+#milestone-detail .description {+ background: #F5F5F5;+ border-radius: 4px;+ padding: 20px;+}+#milestone-detail .progress {+ margin-bottom: 0;+ width: 200px;+}\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/newissue/NewIssuePage.html b/core/src/main/java/io/onedev/server/web/page/project/issues/newissue/NewIssuePage.htmlindex b086de8460..dcdc5bce41 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/newissue/NewIssuePage.html+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/newissue/NewIssuePage.html@@ -11,7 +11,13 @@<div class="form-group"><label class="control-label">Description</label><div wicket:id="description"></div>- </div>+ </div>+ <div class="form-group">+ <label class="control-label">Milestone</label>+ <div>+ <input wicket:id="milestone" type="hidden" class="form-group"></input>+ </div>+ </div><div wicket:id="fields"></div><button type="submit" class="btn btn-primary dirty-aware">Save</button></form>diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/newissue/NewIssuePage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/newissue/NewIssuePage.javaindex 3062015d6a..ec8097055b 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/newissue/NewIssuePage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/newissue/NewIssuePage.java@@ -4,6 +4,7 @@ import java.io.Serializable;import java.util.Date;import java.util.List;import java.util.Set;+import java.util.stream.Collectors;import org.apache.wicket.RestartResponseAtInterceptPageException;import org.apache.wicket.behavior.AttributeAppender;@@ -23,11 +24,13 @@ import io.onedev.server.manager.IssueManager;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.query.IssueQuery;import io.onedev.server.util.inputspec.InputContext;import io.onedev.server.util.inputspec.InputSpec;import io.onedev.server.web.component.comment.CommentInput;import io.onedev.server.web.component.comment.ProjectAttachmentSupport;import io.onedev.server.web.component.markdown.AttachmentSupport;+import io.onedev.server.web.component.stringchoice.StringSingleChoice;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.page.project.ProjectPage;import io.onedev.server.web.page.project.issues.issuedetail.activities.IssueActivitiesPage;@@ -36,22 +39,41 @@ import io.onedev.server.web.page.security.LoginPage;@SuppressWarnings("serial")public class NewIssuePage extends ProjectPage implements InputContext {+ private static final String PARAM_QUERY = "query";++ private String queryString;++ private String milestoneName;+public NewIssuePage(PageParameters params) {super(params);User currentUser = getLoginUser();if (currentUser == null)throw new RestartResponseAtInterceptPageException(LoginPage.class);++ queryString = params.get(PARAM_QUERY).toString();}private IssueManager getIssueManager() {return OneDev.getInstance(IssueManager.class);}- private IssueFieldUnaryManager getIssueFieldManager() {+ private IssueFieldUnaryManager getIssueFieldUnaryManager() {return OneDev.getInstance(IssueFieldUnaryManager.class);}+ private void populateWithQuery(Issue issue, Serializable fieldBean) {+ if (queryString != null) {+ try {+ IssueQuery query = IssueQuery.parse(getProject(), queryString, true);+ if (query.getCriteria() != null)+ query.getCriteria().populate(issue, fieldBean);+ } catch (Exception e) {+ }+ }+ }+@Overrideprotected void onInitialize() {super.onInitialize();@@ -61,7 +83,11 @@ public class NewIssuePage extends ProjectPage implements InputContext {issue.setState(getProject().getIssueWorkflow().getInitialStateSpec().getName());issue.setProject(getProject());issue.setSubmitter(getLoginUser());- Serializable fieldBean = getIssueFieldManager().readFields(issue);+ Serializable fieldBean = getIssueFieldUnaryManager().readFields(issue);++ populateWithQuery(issue, fieldBean);++ milestoneName = issue.getMilestoneName();Form<?> form = new Form<Void>("form") {@@ -70,6 +96,7 @@ public class NewIssuePage extends ProjectPage implements InputContext {super.onSubmit();issue.setProject(getProject());issue.setSubmitter(getLoginUser());+ issue.setMilestone(getProject().getMilestone(milestoneName));getIssueManager().open(issue, fieldBean);setResponsePage(IssueActivitiesPage.class, IssueActivitiesPage.paramsOf(issue, null));}@@ -103,8 +130,22 @@ public class NewIssuePage extends ProjectPage implements InputContext {}});++ List<String> milestones = getProject().getMilestones().stream().map(it->it.getName()).collect(Collectors.toList());+ StringSingleChoice choice = new StringSingleChoice("milestone",+ new PropertyModel<String>(this, "milestoneName"), milestones) {++ @Override+ protected void onInitialize() {+ super.onInitialize();+ getSettings().setPlaceholder("Unspecified");+ }++ };+ choice.setRequired(false);+ form.add(choice);- Set<String> excludedFields = getIssueFieldManager().getExcludedFields(issue,+ Set<String> excludedFields = getIssueFieldUnaryManager().getExcludedFields(issue,getProject().getIssueWorkflow().getInitialStateSpec().getName());form.add(BeanContext.editBean("fields", fieldBean, excludedFields));@@ -132,4 +173,11 @@ public class NewIssuePage extends ProjectPage implements InputContext {throw new UnsupportedOperationException();}+ public static PageParameters paramsOf(Project project, String query) {+ PageParameters params = paramsOf(project);+ if (query != null)+ params.add(PARAM_QUERY, query);+ return params;+ }+}diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/newissue/new-issue.css b/core/src/main/java/io/onedev/server/web/page/project/issues/newissue/new-issue.cssindex bd2c351556..20176d1a73 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/newissue/new-issue.css+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/newissue/new-issue.css@@ -5,3 +5,6 @@#new-issue>.body>div {margin-bottom: 20px;}+#new-issue>.body .select2-container {+ width: 100%;+}\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/fields/IssueFieldsPage.java b/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/fields/IssueFieldsPage.javaindex 0258502e8f..dfea47f004 100644--- a/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/fields/IssueFieldsPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/fields/IssueFieldsPage.java@@ -94,15 +94,6 @@ public class IssueFieldsPage extends IssueWorkflowPage {}});- columns.add(new AbstractColumn<InputSpec, Void>(Model.of("Description")) {-- @Override- public void populateItem(Item<ICellPopulator<InputSpec>> cellItem, String componentId, IModel<InputSpec> rowModel) {- cellItem.add(new ColumnFragment(componentId, rowModel, rowModel.getObject().getDescription(), false));- }-- });-columns.add(new AbstractColumn<InputSpec, Void>(Model.of("Type")) {@Overridediff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/states/IssueStatesPage.java b/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/states/IssueStatesPage.javaindex 6e81620228..be6fc638e2 100644--- a/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/states/IssueStatesPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/states/IssueStatesPage.java@@ -109,7 +109,7 @@ public class IssueStatesPage extends IssueWorkflowPage {}});- columns.add(new AbstractColumn<StateSpec, Void>(Model.of("Color")) {+ columns.add(new AbstractColumn<StateSpec, Void>(Model.of("Closed")) {@Overridepublic void populateItem(Item<ICellPopulator<StateSpec>> cellItem, String componentId, IModel<StateSpec> rowModel) {@@ -125,15 +125,14 @@ public class IssueStatesPage extends IssueWorkflowPage {}};- link.add(new Label("label").add(AttributeAppender.append("style", "background: " + state.getColor() + ";")));- fragment.add(AttributeAppender.append("class", "color"));+ link.add(new Label("label", rowModel.getObject().isClosed()));fragment.add(link);cellItem.add(fragment);}});- columns.add(new AbstractColumn<StateSpec, Void>(Model.of("Description")) {+ columns.add(new AbstractColumn<StateSpec, Void>(Model.of("Color")) {@Overridepublic void populateItem(Item<ICellPopulator<StateSpec>> cellItem, String componentId, IModel<StateSpec> rowModel) {@@ -149,7 +148,8 @@ public class IssueStatesPage extends IssueWorkflowPage {}};- link.add(new Label("label", state.getDescription()));+ link.add(new Label("label").add(AttributeAppender.append("style", "background: " + state.getColor() + ";")));+ fragment.add(AttributeAppender.append("class", "color"));fragment.add(link);cellItem.add(fragment);}