The Unified and Autonomous Development Platform
Issue board navigation/edit/delete/create
robin shene1ce4c1b9fd0
diff --git a/core/src/main/java/io/onedev/server/CoreModule.java b/core/src/main/java/io/onedev/server/CoreModule.javaindex 385851239a..2c2ac496e7 100644--- a/core/src/main/java/io/onedev/server/CoreModule.java+++ b/core/src/main/java/io/onedev/server/CoreModule.java@@ -95,7 +95,6 @@ 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;@@ -114,12 +113,12 @@ import io.onedev.server.manager.PullRequestManager;import io.onedev.server.manager.PullRequestNotificationManager;import io.onedev.server.manager.PullRequestReferenceManager;import io.onedev.server.manager.PullRequestStatusChangeManager;-import io.onedev.server.manager.TaskManager;import io.onedev.server.manager.PullRequestUpdateManager;import io.onedev.server.manager.PullRequestWatchManager;import io.onedev.server.manager.ReviewInvitationManager;import io.onedev.server.manager.ReviewManager;import io.onedev.server.manager.StorageManager;+import io.onedev.server.manager.TaskManager;import io.onedev.server.manager.UrlManager;import io.onedev.server.manager.UserAuthorizationManager;import io.onedev.server.manager.UserInfoManager;@@ -140,7 +139,6 @@ 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;@@ -159,12 +157,12 @@ import io.onedev.server.manager.impl.DefaultPullRequestManager;import io.onedev.server.manager.impl.DefaultPullRequestNotificationManager;import io.onedev.server.manager.impl.DefaultPullRequestReferenceManager;import io.onedev.server.manager.impl.DefaultPullRequestStatusChangeManager;-import io.onedev.server.manager.impl.DefaultTaskManager;import io.onedev.server.manager.impl.DefaultPullRequestUpdateManager;import io.onedev.server.manager.impl.DefaultPullRequestWatchManager;import io.onedev.server.manager.impl.DefaultReviewInvitationManager;import io.onedev.server.manager.impl.DefaultReviewManager;import io.onedev.server.manager.impl.DefaultStorageManager;+import io.onedev.server.manager.impl.DefaultTaskManager;import io.onedev.server.manager.impl.DefaultUserAuthorizationManager;import io.onedev.server.manager.impl.DefaultUserInfoManager;import io.onedev.server.manager.impl.DefaultUserManager;@@ -328,7 +326,6 @@ 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);diff --git a/core/src/main/java/io/onedev/server/manager/IssueBoardManager.java b/core/src/main/java/io/onedev/server/manager/IssueBoardManager.javadeleted file mode 100644index acb4ecce21..0000000000--- a/core/src/main/java/io/onedev/server/manager/IssueBoardManager.java+++ /dev/null@@ -1,14 +0,0 @@-package io.onedev.server.manager;--import javax.annotation.Nullable;--import io.onedev.server.model.IssueBoard;-import io.onedev.server.model.Project;-import io.onedev.server.persistence.dao.EntityManager;--public interface IssueBoardManager extends EntityManager<IssueBoard> {-- @Nullable- IssueBoard find(Project project, String name);--}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.javadeleted file mode 100644index 7d800027cc..0000000000--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueBoardManager.java+++ /dev/null@@ -1,32 +0,0 @@-package io.onedev.server.manager.impl;--import javax.inject.Inject;-import javax.inject.Singleton;--import org.hibernate.criterion.Restrictions;--import io.onedev.server.manager.IssueBoardManager;-import io.onedev.server.model.IssueBoard;-import io.onedev.server.model.Project;-import io.onedev.server.persistence.dao.AbstractEntityManager;-import io.onedev.server.persistence.dao.Dao;-import io.onedev.server.persistence.dao.EntityCriteria;--@Singleton-public class DefaultIssueBoardManager extends AbstractEntityManager<IssueBoard>- implements IssueBoardManager {-- @Inject- public DefaultIssueBoardManager(Dao dao) {- super(dao);- }-- @Override- public IssueBoard find(Project project, String name) {- EntityCriteria<IssueBoard> criteria = newCriteria();- criteria.add(Restrictions.eq("project", project));- criteria.add(Restrictions.eq("name", name));- return find(criteria);- }--}diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultMilestoneManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultMilestoneManager.javaindex 3fafd55f4d..48ba18c0b7 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultMilestoneManager.java+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultMilestoneManager.java@@ -1,7 +1,6 @@package io.onedev.server.manager.impl;import java.util.ArrayList;-import java.util.Date;import java.util.List;import javax.annotation.Nullable;@@ -97,7 +96,6 @@ public class DefaultMilestoneManager extends AbstractEntityManager<Milestone> immilestone.setNumOfOpenIssues(0);}}- milestone.setUpdateDate(new Date());milestone.setClosed(true);save(milestone);}diff --git a/core/src/main/java/io/onedev/server/model/Milestone.java b/core/src/main/java/io/onedev/server/model/Milestone.javaindex 3beb46a242..400e9d4f29 100644--- a/core/src/main/java/io/onedev/server/model/Milestone.java+++ b/core/src/main/java/io/onedev/server/model/Milestone.java@@ -4,6 +4,7 @@ import java.util.ArrayList;import java.util.Collection;import java.util.Date;+import javax.persistence.Column;import javax.persistence.Entity;import javax.persistence.Index;import javax.persistence.JoinColumn;@@ -11,6 +12,7 @@ import javax.persistence.ManyToOne;import javax.persistence.OneToMany;import javax.persistence.Table;import javax.persistence.UniqueConstraint;+import javax.validation.constraints.NotNull;import org.hibernate.annotations.Cache;import org.hibernate.annotations.CacheConcurrencyStrategy;@@ -36,14 +38,14 @@ public class Milestone extends AbstractEntity {@JoinColumn(nullable=false)private Project project;+ @Column(nullable=false)private String name;private String description;+ @Column(nullable=false)private Date dueDate;- private Date updateDate;-private int numOfOpenIssues;private int numOfClosedIssues;@@ -82,6 +84,7 @@ public class Milestone extends AbstractEntity {}@Editable(order=300)+ @NotNullpublic Date getDueDate() {return dueDate;}@@ -90,14 +93,6 @@ public class Milestone extends AbstractEntity {this.dueDate = dueDate;}- public Date getUpdateDate() {- return updateDate;- }-- public void setUpdateDate(Date updateDate) {- this.updateDate = updateDate;- }-public boolean isClosed() {return closed;}diff --git a/core/src/main/java/io/onedev/server/model/Project.java b/core/src/main/java/io/onedev/server/model/Project.javaindex 57b9900550..3db8cc581a 100644--- a/core/src/main/java/io/onedev/server/model/Project.java+++ b/core/src/main/java/io/onedev/server/model/Project.java@@ -81,6 +81,7 @@ import io.onedev.server.manager.UserManager;import io.onedev.server.model.support.BranchProtection;import io.onedev.server.model.support.CommitMessageTransformSetting;import io.onedev.server.model.support.TagProtection;+import io.onedev.server.model.support.issue.IssueBoard;import io.onedev.server.model.support.issue.NamedQuery;import io.onedev.server.model.support.issue.workflow.IssueWorkflow;import io.onedev.server.persistence.UnitOfWork;@@ -179,9 +180,6 @@ public class Project extends AbstractEntity {@OneToMany(mappedBy="project", cascade=CascadeType.REMOVE)private Collection<Milestone> milestones = new ArrayList<>();- @OneToMany(mappedBy="project", cascade=CascadeType.REMOVE)- private Collection<IssueBoard> issueBoards = new ArrayList<>();-@Lob@Column(nullable=false, length=65535)private IssueWorkflow issueWorkflow = new IssueWorkflow();@@ -194,6 +192,10 @@ public class Project extends AbstractEntity {@Column(nullable=false, length=65535)private ArrayList<String> issueListFields = new ArrayList<>();+ @Lob+ @Column(nullable=false, length=65535)+ private ArrayList<IssueBoard> issueBoards = new ArrayList<>();+private transient Repository repository;private transient Map<BlobIdent, Blob> blobCache;@@ -934,11 +936,11 @@ public class Project extends AbstractEntity {this.milestones = milestones;}- public Collection<IssueBoard> getIssueBoards() {+ public ArrayList<IssueBoard> getIssueBoards() {return issueBoards;}- public void setIssueBoards(Collection<IssueBoard> issueBoards) {+ public void setIssueBoards(ArrayList<IssueBoard> issueBoards) {this.issueBoards = issueBoards;}diff --git a/core/src/main/java/io/onedev/server/model/IssueBoard.java b/core/src/main/java/io/onedev/server/model/support/issue/IssueBoard.javasimilarity index 68%rename from core/src/main/java/io/onedev/server/model/IssueBoard.javarename to core/src/main/java/io/onedev/server/model/support/issue/IssueBoard.javaindex 0686a5ca69..567734d155 100644--- a/core/src/main/java/io/onedev/server/model/IssueBoard.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/IssueBoard.java@@ -1,25 +1,18 @@-package io.onedev.server.model;+package io.onedev.server.model.support.issue;+import java.io.Serializable;import java.util.ArrayList;-import java.util.HashMap;+import java.util.LinkedHashMap;import java.util.List;import java.util.Map;-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;+import javax.annotation.Nullable;import javax.validation.constraints.Size;-import org.hibernate.annotations.Cache;-import org.hibernate.annotations.CacheConcurrencyStrategy;import org.hibernate.validator.constraints.NotEmpty;+import io.onedev.server.model.Issue;+import io.onedev.server.model.Project;import io.onedev.server.model.support.issue.workflow.StateSpec;import io.onedev.server.util.OneContext;import io.onedev.server.util.inputspec.InputSpec;@@ -30,50 +23,18 @@ import io.onedev.server.web.editable.annotation.ChoiceProvider;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.IssueQuery;-@Entity-@Table(- indexes={@Index(columnList="g_project_id"), @Index(columnList="g_milestone_id"), @Index(columnList="name")},- uniqueConstraints={@UniqueConstraint(columnNames={"g_project_id", "name"})}-)-@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)@Editable-public class IssueBoard extends AbstractEntity {+public class IssueBoard implements Serializable {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 issueFilter;- @Column(nullable=false)private String identifyField;- @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;- }+ private List<String> columns = new ArrayList<>();@Editable(order=100)@NotEmpty@@ -87,6 +48,7 @@ public class IssueBoard extends AbstractEntity {@Editable(order=200, name="Issue Filter", description="Optionally specify a query to filter issues of the board")@IssueQuery(allowSort=false)+ @Nullablepublic String getIssueFilter() {return issueFilter;}@@ -110,11 +72,11 @@ public class IssueBoard extends AbstractEntity {+ "a value of the issue field specified above")@Size(min=2, message="At least two columns need to be defined")@ChoiceProvider("getColumnChoices")- public ArrayList<String> getColumns() {+ public List<String> getColumns() {return columns;}- public void setColumns(ArrayList<String> columns) {+ public void setColumns(List<String> columns) {this.columns = columns;}@@ -133,7 +95,7 @@ public class IssueBoard extends AbstractEntity {@SuppressWarnings("unused")private static Map<String, String> getColumnChoices() {- Map<String, String> choices = new HashMap<>();+ Map<String, String> choices = new LinkedHashMap<>();Project project = OneContext.get().getProject();String fieldName = (String) OneContext.get().getEditContext().getInputValue("identifyField");if (Issue.STATE.equals(fieldName)) {@@ -149,4 +111,12 @@ public class IssueBoard extends AbstractEntity {return choices;}+ public static int getBoardIndex(List<IssueBoard> boards, String name) {+ for (int i=0; i<boards.size(); i++) {+ if (name.equals(boards.get(i).getName()))+ return i;+ }+ return -1;+ }+}diff --git a/core/src/main/java/io/onedev/server/util/MilestoneSort.java b/core/src/main/java/io/onedev/server/util/MilestoneSort.javaindex 059da88b63..5b836c4a73 100644--- a/core/src/main/java/io/onedev/server/util/MilestoneSort.java+++ b/core/src/main/java/io/onedev/server/util/MilestoneSort.java@@ -4,11 +4,11 @@ import org.eclipse.jgit.util.StringUtils;import org.hibernate.criterion.Order;public enum MilestoneSort {- RECENTLY_UPDATED {+ CLOSEST_DUE_DATE {@Overridepublic Order getOrder() {- return Order.desc("updateDate");+ return Order.asc("dueDate");}},@@ -19,14 +19,6 @@ public enum MilestoneSort {return Order.desc("dueDate");}- },- CLOSEST_DUE_DATE {-- @Override- public Order getOrder() {- return Order.asc("dueDate");- }-},MOST_ISSUES {diff --git a/core/src/main/java/io/onedev/server/web/component/MilestoneDueLabel.java b/core/src/main/java/io/onedev/server/web/component/MilestoneDueLabel.javanew file mode 100644index 0000000000..9623c9429b--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/component/MilestoneDueLabel.java@@ -0,0 +1,43 @@+package io.onedev.server.web.component;++import java.util.Date;++import org.apache.wicket.behavior.AttributeAppender;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.LoadableDetachableModel;++import io.onedev.server.model.Milestone;+import io.onedev.server.util.DateUtils;++@SuppressWarnings("serial")+public class MilestoneDueLabel extends Label {++ private final IModel<Milestone> milestoneModel;++ public MilestoneDueLabel(String id, IModel<Milestone> milestoneModel) {+ super(id, new LoadableDetachableModel<String>() {++ @Override+ protected String load() {+ return DateUtils.formatDate(milestoneModel.getObject().getDueDate());+ }++ });+ this.milestoneModel = milestoneModel;+ }++ @Override+ protected void onDetach() {+ milestoneModel.detach();+ super.onDetach();+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();+ if (milestoneModel.getObject().getDueDate().before(new Date()))+ add(AttributeAppender.append("style", "color: red;"));+ }++}diff --git a/core/src/main/java/io/onedev/server/web/component/MilestoneStatusLabel.java b/core/src/main/java/io/onedev/server/web/component/MilestoneStatusLabel.javanew file mode 100644index 0000000000..145a58e5f9--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/component/MilestoneStatusLabel.java@@ -0,0 +1,47 @@+package io.onedev.server.web.component;++import org.apache.wicket.behavior.AttributeAppender;+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 io.onedev.server.model.Milestone;++@SuppressWarnings("serial")+public class MilestoneStatusLabel extends Label {++ private final IModel<Milestone> milestoneModel;++ public MilestoneStatusLabel(String id, IModel<Milestone> milestoneModel) {+ super(id, new LoadableDetachableModel<String>() {++ @Override+ protected String load() {+ return milestoneModel.getObject().isClosed()? "Closed": "Open";+ }++ });+ this.milestoneModel = milestoneModel;+ }++ @Override+ protected void onDetach() {+ milestoneModel.detach();+ super.onDetach();+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();+ add(AttributeAppender.append("class", new AbstractReadOnlyModel<String>() {++ @Override+ public String getObject() {+ return "label label-" + (milestoneModel.getObject().isClosed()? "success": "warning");+ }++ }));+ }++}diff --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.htmlindex 20c02777b6..6db1ea2e36 100644--- 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.html@@ -9,7 +9,7 @@</span></div></form>- <a wicket:id="newIssue" class="open-new btn btn-success"><i class="fa fa-plus"></i> Open New</a>+ <a wicket:id="newIssue" class="open-new btn btn-success"><i class="fa fa-plus"></i> New Issue</a><div class="others clearfix"><a wicket:id="saveQuery" class="pull-left"><i class="fa fa-save"></i> Save Query</a><a wicket:id="batchEditSelected" class="pull-left"><i class="fa fa-pencil"></i> Batch Edit Selected</a>diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BoardEditPage.html b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BoardEditPage.htmlindex 6e040bc21e..5befed6e1c 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BoardEditPage.html+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BoardEditPage.html@@ -1,4 +1,13 @@<wicket:extend><div id="board-edit">+ <div class="head"><h4>Edit Board</h4></div>+ <div class="body">+ <form wicket:id="form" class="leave-confirm">+ <div wicket:id="editor"></div>+ <div class="actions">+ <input type="submit" value="Save" class="btn btn-primary dirty-aware"></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/issueboards/BoardEditPage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BoardEditPage.javaindex 64a58c4c3a..c65ee4c4ed 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BoardEditPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BoardEditPage.java@@ -1,16 +1,72 @@package io.onedev.server.web.page.project.issues.issueboards;+import java.util.ArrayList;++import org.apache.commons.lang3.SerializationUtils;+import org.apache.wicket.Session;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.head.JavaScriptHeaderItem;+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.exception.OneException;+import io.onedev.server.manager.ProjectManager;+import io.onedev.server.model.Project;+import io.onedev.server.model.support.issue.IssueBoard;+import io.onedev.server.security.SecurityUtils;+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 BoardEditPage extends IssuesPage {+ private static final String PARAM_BOARD = "board";++ private final ArrayList<IssueBoard> boards;++ private final int index;+public BoardEditPage(PageParameters params) {super(params);++ boards = getProject().getIssueBoards();+ String name = params.get(PARAM_BOARD).toString();+ index = IssueBoard.getBoardIndex(boards, name);+ if (index == -1)+ throw new OneException("Can not find board: " + name);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ IssueBoard board = SerializationUtils.clone(boards.get(index));+ BeanEditor editor = BeanContext.editBean("editor", board);+ Form<?> form = new Form<Void>("form") {++ @Override+ protected void onSubmit() {+ super.onSubmit();+ int indexWithSameName = IssueBoard.getBoardIndex(boards, board.getName());+ if (indexWithSameName != -1 && indexWithSameName != index) {+ editor.getErrorContext(new PathSegment.Property("name"))+ .addError("This name has already been used by another issue board in the project");+ }+ if (!editor.hasErrors(true)){+ boards.set(index, board);+ getProject().setIssueBoards(boards);+ OneDev.getInstance(ProjectManager.class).save(getProject());+ Session.get().success("Issue board saved");+ setResponsePage(IssueBoardsPage.class, IssueBoardsPage.paramsOf(getProject(), board, null, null));+ }+ }++ };+ form.add(editor);+ add(form);}@Override@@ -19,4 +75,15 @@ public class BoardEditPage extends IssuesPage {response.render(JavaScriptHeaderItem.forReference(new IssueBoardsResourceReference()));}+ public static PageParameters paramsOf(Project project, IssueBoard board) {+ PageParameters params = paramsOf(project);+ params.add(PARAM_BOARD, board.getName());+ return params;+ }++ @Override+ protected boolean isPermitted() {+ return SecurityUtils.canManage(getProject());+ }+}diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/IssueBoardsPage.html b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/IssueBoardsPage.htmlindex c3c27c205c..50e76accd3 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/IssueBoardsPage.html+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/IssueBoardsPage.html@@ -3,26 +3,28 @@<wicket:container wicket:id="content"></wicket:container></div><wicket:fragment wicket:id="hasBoardsFrag">- <div class="head clearfix">- <div class="input-group">- <span class="input-group-btn">- <a class="board-selector btn btn-default">- <i class="fa fa-columns"></i>- States- <i class="fa fa-caret-down"></i>- </a>- <a class="milestone-selector btn btn-default">- <i class="fa fa-ext fa-milestone"></i>- All- <i class="fa fa-caret-down"></i>- </a>- </span>- <input class="form-control"></input>- <span class="input-group-btn">- <button type="submit" class="btn btn-default" title="Query"><i class="fa fa-search"></i></button>- </span>- </div>- <a class="btn btn-success add-new"><i class="fa fa-plus"></i> Add New</a>+ <div class="head">+ <form wicket:id="query" class="clearable-wrapper">+ <div class="input-group">+ <span class="input-group-btn">+ <a wicket:id="boardMenu" class="board-selector btn btn-default">+ <i class="fa fa-columns"></i>+ <span wicket:id="board"></span>+ <i class="fa fa-caret-down"></i>+ </a>+ <a wicket:id="milestoneMenu" class="milestone-selector btn btn-default">+ <i class="fa fa-ext fa-milestone"></i>+ <span wicket:id="milestone"></span>+ <i class="fa fa-caret-down"></i>+ </a>+ </span>+ <input wicket:id="input" spellcheck="false" autocomplete="off" class="form-control no-autofocus" placeholder="Filter issues"></input>+ <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>+ <a wicket:id="newBoard" class="btn btn-success add-new"><i class="fa fa-plus"></i> New Board</a></div><div class="body"></div>@@ -30,4 +32,24 @@<wicket:fragment wicket:id="noBoardsFrag"><div class="alert alert-info no-boards">No issue boards defined <a wicket:id="newBoard"><i class="fa fa-plus"></i> Add New</a></div></wicket:fragment>+ <wicket:fragment wicket:id="boardMenuFrag">+ <div class="board-menu board-and-milestone">+ <div wicket:id="boards" class="board">+ <span wicket:id="dragHandle" class="drag-handle" title="Drag to reorder"><i class="fa fa-arrows"></i></span>+ <a wicket:id="select" class="select"><span wicket:id="name"></span></a>+ <a wicket:id="edit" class="action" title="Edit"><i class="fa fa-pencil"></i></a>+ <a wicket:id="delete" class="action" title="Delete"><i class="fa fa-trash"></i></a>+ </div>+ </div>+ </wicket:fragment>+ <wicket:fragment wicket:id="milestoneMenuFrag">+ <div class="milestone-menu">+ <div wicket:id="milestones" class="milestone">+ <a wicket:id="select" class="select"><span wicket:id="name"></span></a>+ <span wicket:id="status" class="status"></span>+ <a wicket:id="detail" class="action" title="Detail"><i class="fa fa-arrow-circle-right"></i></a>+ </div>+ <a wicket:id="showClosed">Show Closed <i class="fa fa-angle-double-down"></i></a>+ </div>+ </wicket:fragment></wicket:extend>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/IssueBoardsPage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/IssueBoardsPage.javaindex 22e279ab07..00013056fe 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/IssueBoardsPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/IssueBoardsPage.java@@ -1,19 +1,52 @@package io.onedev.server.web.page.project.issues.issueboards;+import java.util.ArrayList;+import java.util.Comparator;+import java.util.List;+import java.util.stream.Collectors;+import javax.annotation.Nullable;+import org.apache.wicket.Component;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.markup.html.AjaxLink;+import org.apache.wicket.behavior.AttributeAppender;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.Button;+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.model.AbstractReadOnlyModel;+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 io.onedev.server.model.IssueBoard;+import edu.emory.mathcs.backport.java.util.Collections;+import io.onedev.server.OneDev;+import io.onedev.server.exception.OneException;+import io.onedev.server.manager.ProjectManager;import io.onedev.server.model.Milestone;import io.onedev.server.model.Project;+import io.onedev.server.model.support.issue.IssueBoard;import io.onedev.server.security.SecurityUtils;+import io.onedev.server.web.behavior.IssueQueryBehavior;+import io.onedev.server.web.behavior.sortable.SortBehavior;+import io.onedev.server.web.behavior.sortable.SortPosition;+import io.onedev.server.web.component.MilestoneStatusLabel;+import io.onedev.server.web.component.floating.FloatingPanel;+import io.onedev.server.web.component.link.DropdownLink;import io.onedev.server.web.page.project.issues.IssuesPage;+import io.onedev.server.web.page.project.issues.milestones.MilestoneDetailPage;+import io.onedev.server.web.util.ConfirmOnClick;@SuppressWarnings("serial")public class IssueBoardsPage extends IssuesPage {@@ -22,17 +55,297 @@ public class IssueBoardsPage extends IssuesPage {private static final String PARAM_MILESTONE = "milestone";+ private static final String PARAM_QUERY = "query";++ private final IModel<IssueBoard> boardModel;++ private final IModel<Milestone> milestoneModel;++ private final String query;+public IssueBoardsPage(PageParameters params) {super(params);++ String boardName = params.get(PARAM_BOARD).toString();+ String milestoneName = params.get(PARAM_MILESTONE).toString();++ boardModel = new LoadableDetachableModel<IssueBoard>() {++ @Override+ protected IssueBoard load() {+ if (boardName != null) {+ for (IssueBoard board: getProject().getIssueBoards()) {+ if (board.getName().equals(boardName))+ return board;+ }+ throw new OneException("Can not find issue board: " + boardName);+ } else if (!getProject().getIssueBoards().isEmpty()) {+ return getProject().getIssueBoards().iterator().next();+ } else {+ return null;+ }+ }++ };++ milestoneModel = new LoadableDetachableModel<Milestone>() {++ @Override+ protected Milestone load() {+ if (milestoneName != null) {+ Milestone milestone = getProject().getMilestone(milestoneName);+ if (milestone != null)+ return milestone;+ else+ throw new OneException("Can not find milestone: " + milestoneName);+ } else {+ for (Milestone each: getMilestones()) {+ if (!each.isClosed())+ return each;+ }+ Milestone milestone = null;+ for (Milestone each: getMilestones()) {+ if (each.isClosed())+ milestone = each;+ }+ return milestone;+ }+ }++ };++ query = params.get(PARAM_QUERY).toString();+ }++ private List<Milestone> getMilestones() {+ List<Milestone> milestones = new ArrayList<>(getProject().getMilestones());+ Collections.sort(milestones, new Comparator<Milestone>() {++ @Override+ public int compare(Milestone o1, Milestone o2) {+ return o1.getDueDate().compareTo(o2.getDueDate());+ }++ });+ return milestones;}+ @Override+ protected void onDetach() {+ boardModel.detach();+ milestoneModel.detach();+ super.onDetach();+ }++ @Nullable+ private IssueBoard getBoard() {+ return boardModel.getObject();+ }++ @Nullable+ private Milestone getMilestone() {+ return milestoneModel.getObject();+ }+@Overrideprotected void onInitialize() {super.onInitialize();- if (!getProject().getIssueBoards().isEmpty()) {+ if (getBoard() != null) {Fragment fragment = new Fragment("content", "hasBoardsFrag", this);++ Form<?> form = new Form<Void>("query");+ if (!SecurityUtils.canManage(getProject()))+ form.add(AttributeAppender.append("style", "margin-right: 0;"));++ form.add(new DropdownLink("boardMenu") {++ protected void onInitialize() {+ super.onInitialize();+ add(new Label("board", getBoard().getName()));+ }++ @Override+ protected Component newContent(String id, FloatingPanel dropdown) {+ Fragment fragment = new Fragment(id, "boardMenuFrag", IssueBoardsPage.this);++ ArrayList<IssueBoard> boards = getProject().getIssueBoards();+ fragment.add(new ListView<IssueBoard>("boards", boards) {++ @Override+ protected void populateItem(ListItem<IssueBoard> item) {+ item.add(new WebMarkupContainer("dragHandle").setVisible(SecurityUtils.canManage(getProject())));++ PageParameters params = IssueBoardsPage.paramsOf(getProject(), item.getModelObject(), getMilestone(), query);+ Link<Void> link = new BookmarkablePageLink<Void>("select", IssueBoardsPage.class, params);+ link.add(new Label("name", item.getModelObject().getName()));+ item.add(link);++ params = BoardEditPage.paramsOf(getProject(), getBoard());+ item.add(new BookmarkablePageLink<Void>("edit", BoardEditPage.class, params) {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(SecurityUtils.canManage(getProject()));+ }++ });++ item.add(new Link<Void>("delete") {++ @Override+ public void onClick() {+ getProject().getIssueBoards().remove(getBoard());+ OneDev.getInstance(ProjectManager.class).save(getProject());++ PageParameters params;+ if (item.getModelObject().getName().equals(getBoard().getName()))+ params = IssueBoardsPage.paramsOf(getProject(), null, getMilestone(), query);+ else+ params = IssueBoardsPage.paramsOf(getProject(), getBoard(), getMilestone(), query);+ setResponsePage(IssueBoardsPage.class, params);+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(SecurityUtils.canManage(getProject()));+ }++ }.add(new ConfirmOnClick("Do you really want to delete board '" + item.getModelObject().getName() + "'?") ));++ if (item.getModelObject().getName().equals(getBoard().getName()))+ item.add(AttributeAppender.append("class", "active"));+ }++ });++ fragment.add(new SortBehavior() {++ @Override+ protected void onSort(AjaxRequestTarget target, SortPosition from, SortPosition to) {+ IssueBoard board = boards.get(from.getItemIndex());+ boards.set(from.getItemIndex(), boards.set(to.getItemIndex(), board));+ getProject().setIssueBoards(boards);+ OneDev.getInstance(ProjectManager.class).save(getProject());+ target.add(fragment);+ }++ }.handle(".drag-handle").items(".board"));++ fragment.setOutputMarkupId(true);++ return fragment;+ }++ });+ form.add(new DropdownLink("milestoneMenu") {++ private boolean showClosed;++ @Override+ protected void onInitialize() {+ super.onInitialize();+ add(new Label("milestone", new AbstractReadOnlyModel<String>() {++ @Override+ public String getObject() {+ return getMilestone().getName();+ }++ }));+ }++ @Override+ protected Component newContent(String id, FloatingPanel dropdown) {+ Fragment fragment = new Fragment(id, "milestoneMenuFrag", IssueBoardsPage.this);++ fragment.add(new ListView<Milestone>("milestones", new LoadableDetachableModel<List<Milestone>>() {++ @Override+ protected List<Milestone> load() {+ List<Milestone> milestones = getMilestones().stream().filter(it->!it.isClosed()).collect(Collectors.toList());+ if (getMilestone().isClosed() || showClosed) {+ List<Milestone> closedMilestones = getMilestones().stream().filter(it->it.isClosed()).collect(Collectors.toList());+ Collections.reverse(closedMilestones);+ milestones.addAll(closedMilestones);+ }+ return milestones;+ }++ }) {++ @Override+ protected void populateItem(ListItem<Milestone> item) {+ Milestone milestone = item.getModelObject();+ PageParameters params = IssueBoardsPage.paramsOf(getProject(), getBoard(), milestone, query);+ Link<Void> link = new BookmarkablePageLink<Void>("select", IssueBoardsPage.class, params);+ link.add(new Label("name", milestone.getName()));+ item.add(link);++ item.add(new MilestoneStatusLabel("status", item.getModel()));+ params = MilestoneDetailPage.paramsOf(milestone, null);+ item.add(new BookmarkablePageLink<Void>("detail", MilestoneDetailPage.class, params));+ if (item.getModelObject().getName().equals(getMilestone().getName()))+ item.add(AttributeAppender.append("class", "active"));+ }++ });+ fragment.add(new AjaxLink<Void>("showClosed") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ showClosed = true;+ target.add(fragment);+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(!showClosed && !getMilestone().isClosed()+ && getMilestones().stream().anyMatch(it->it.isClosed()));+ }++ });+ fragment.setOutputMarkupId(true);+ return fragment;+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(getMilestone() != null);+ }++ });++ TextField<String> input = new TextField<String>("input", Model.of(query));+ input.add(new IssueQueryBehavior(projectModel, false));+ form.add(input);++ form.add(new Button("submit") {++ @Override+ public void onSubmit() {+ super.onSubmit();+ PageParameters params = IssueBoardsPage.paramsOf(getProject(), getBoard(), getMilestone(), input.getModelObject());+ setResponsePage(IssueBoardsPage.class, params);+ }++ });++ fragment.add(form);+ fragment.add(new BookmarkablePageLink<Void>("newBoard", NewBoardPage.class, NewBoardPage.paramsOf(getProject())) {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(SecurityUtils.canManage(getProject()));+ }++ });add(fragment);} else {Fragment fragment = new Fragment("content", "noBoardsFrag", this);@@ -57,12 +370,14 @@ public class IssueBoardsPage extends IssuesPage {}public static PageParameters paramsOf(Project project, @Nullable IssueBoard board,- @Nullable Milestone milestone) {+ @Nullable Milestone milestone, @Nullable String query) {PageParameters params = paramsOf(project);if (board != null)params.add(PARAM_BOARD, board.getName());if (milestone != null)params.add(PARAM_MILESTONE, milestone.getName());+ if (query != null)+ params.add(PARAM_QUERY, query);return params;}diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/NewBoardPage.html b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/NewBoardPage.htmlindex 5d28698dd1..034d5e1cfa 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/NewBoardPage.html+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/NewBoardPage.html@@ -2,10 +2,10 @@<div id="new-board"><div class="head"><h4>New Board</h4></div><div class="body">- <form wicket:id="form">+ <form wicket:id="form" class="leave-confirm"><div wicket:id="editor"></div><div class="actions">- <input type="submit" value="Create" class="btn btn-primary"></input>+ <input type="submit" value="Create" class="btn btn-primary dirty-aware"></input></div></form></div>diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/NewBoardPage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/NewBoardPage.javaindex b20fead8df..edf90ff86f 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/NewBoardPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/NewBoardPage.java@@ -1,5 +1,7 @@package io.onedev.server.web.page.project.issues.issueboards;+import java.util.ArrayList;+import org.apache.wicket.Session;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.head.JavaScriptHeaderItem;@@ -7,8 +9,9 @@ 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.IssueBoardManager;-import io.onedev.server.model.IssueBoard;+import io.onedev.server.manager.ProjectManager;+import io.onedev.server.model.support.issue.IssueBoard;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;import io.onedev.server.web.editable.PathSegment;@@ -17,33 +20,36 @@ import io.onedev.server.web.page.project.issues.IssuesPage;@SuppressWarnings("serial")public class NewBoardPage extends IssuesPage {+ private final ArrayList<IssueBoard> boards;+public NewBoardPage(PageParameters params) {super(params);+ boards = getProject().getIssueBoards();}@Overrideprotected void onInitialize() {super.onInitialize();- IssueBoard issueBoard = new IssueBoard();+ IssueBoard board = new IssueBoard();- BeanEditor editor = BeanContext.editBean("editor", issueBoard);+ BeanEditor editor = BeanContext.editBean("editor", board);Form<?> form = new Form<Void>("form") {@Overrideprotected void onSubmit() {super.onSubmit();- IssueBoardManager issueBoardManager = OneDev.getInstance(IssueBoardManager.class);- IssueBoard issueBoardWithSameName = issueBoardManager.find(getProject(), issueBoard.getName());- if (issueBoardWithSameName != null) {+ int indexWithSameName = IssueBoard.getBoardIndex(boards, board.getName());+ if (indexWithSameName != -1) {editor.getErrorContext(new PathSegment.Property("name")).addError("This name has already been used by another issue board in the project");}if (!editor.hasErrors(true)){- issueBoard.setProject(getProject());- issueBoardManager.save(issueBoard);+ boards.add(board);+ getProject().setIssueBoards(boards);+ OneDev.getInstance(ProjectManager.class).save(getProject());Session.get().success("New issue board created");- setResponsePage(IssueBoardsPage.class, IssueBoardsPage.paramsOf(getProject(), issueBoard, null));+ setResponsePage(IssueBoardsPage.class, IssueBoardsPage.paramsOf(getProject(), board, null, null));}}@@ -58,4 +64,9 @@ public class NewBoardPage extends IssuesPage {response.render(JavaScriptHeaderItem.forReference(new IssueBoardsResourceReference()));}+ @Override+ protected boolean isPermitted() {+ return SecurityUtils.canManage(getProject());+ }+}diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/issue-boards.css b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/issue-boards.cssindex 066b868dc2..02a87b3eac 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/issue-boards.css+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/issue-boards.css@@ -1,7 +1,7 @@#issue-boards>.head {position: relative;}-#issue-boards>.head>.input-group {+#issue-boards>.head>form {margin-right: 120px;}#issue-boards>.head>.add-new {@@ -18,3 +18,46 @@#new-board>.head {margin-bottom: 20px;}+.board-menu, .milestone-menu {+ padding: 8px 12px;+}+.board-menu .board, .milestone-menu .milestone {+ position: relative;+ padding: 4px 0 4px 20px;+ white-space: nowrap;+}+.board-menu .active:before, .milestone-menu .active:before {+ content: "\f00c";+ font-family: "FontAwesome";+ position: absolute;+ left: 0;+ top: 4px;+}+.milestone-menu .active:before {+ top: 6px;+}+.board-menu a.action, .milestone-menu a.action {+ text-decoration: none;+ margin-left: 8px;+ color: #444;+}+.milestone-menu .status {+ margin-left: 4px;+}+.milestone-menu .action {+ font-size: 16px;+}+.milestone-menu>a {+ display: block;+ text-decoration: none;+ background: #F9F9F9;+ border: 1px solid #CCC;+ border-radius: 3px;+ padding: 4px 8px;+ margin-top: 8px;+ color: #666;+ font-size: 12px;+}+.milestone-menu>a:hover {+ background: #E5E5E5;+}\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneActionsPanel.html b/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneActionsPanel.htmlindex f8ee095e94..0e1fcfdef7 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneActionsPanel.html+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneActionsPanel.html@@ -1,9 +1,9 @@<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>+ <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="confirmCloseWithOpenIssuesFrag"><form wicket:id="form" class="confirm-close-milestone no-autofocus">diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneDetailPage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneDetailPage.javaindex a08348daa4..6a8407d1e0 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneDetailPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneDetailPage.java@@ -3,11 +3,9 @@ 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;@@ -21,7 +19,8 @@ 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.MilestoneDueLabel;+import io.onedev.server.web.component.MilestoneStatusLabel;import io.onedev.server.web.component.MultilineLabel;import io.onedev.server.web.component.issuelist.IssueListPanel;import io.onedev.server.web.component.issuelist.QuerySaveSupport;@@ -67,38 +66,9 @@ public class MilestoneDetailPage extends IssuesPage {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()? "success": "warning");- }-- })));+ add(new MilestoneStatusLabel("status", milestoneModel));- 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 MilestoneDueLabel("due", milestoneModel));add(new MilestoneActionsPanel("actions", milestoneModel) {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.htmlindex fe542779ed..64f9cb0a2b 100644--- 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.html@@ -4,7 +4,7 @@<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>+ <input type="submit" value="Ok" class="btn btn-primary dirty-aware"></input></div></form></div>diff --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.javaindex 6e7cc98f3e..1869a47233 100644--- 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.java@@ -1,7 +1,5 @@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;@@ -13,6 +11,7 @@ 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.security.SecurityUtils;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;import io.onedev.server.web.editable.PathSegment;@@ -59,7 +58,6 @@ public class MilestoneEditPage extends IssuesPage {}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));@@ -90,4 +88,9 @@ public class MilestoneEditPage extends IssuesPage {return params;}+ @Override+ protected boolean isPermitted() {+ return SecurityUtils.canManage(getProject());+ }+}diff --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.javaindex f1c56eb15e..719fe9e01d 100644--- 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.java@@ -34,9 +34,9 @@ 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.MilestoneDueLabel;import io.onedev.server.web.component.datatable.HistoryAwareDataTable;import io.onedev.server.web.component.floating.FloatingPanel;import io.onedev.server.web.component.menu.MenuItem;@@ -79,7 +79,7 @@ public class MilestoneListPage extends IssuesPage {if (sortString != null)sort = MilestoneSort.valueOf(sortString.toUpperCase());else- sort = MilestoneSort.RECENTLY_UPDATED;+ sort = MilestoneSort.CLOSEST_DUE_DATE;}@Override@@ -137,6 +137,12 @@ public class MilestoneListPage extends IssuesPage {setResponsePage(NewMilestonePage.class, NewMilestonePage.paramsOf(getProject()));}+ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(SecurityUtils.canManage(getProject()));+ }+});List<IColumn<Milestone, Void>> columns = new ArrayList<>();@@ -161,11 +167,7 @@ public class MilestoneListPage extends IssuesPage {@Overridepublic 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));+ cellItem.add(new MilestoneDueLabel(componentId, rowModel));}});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.htmlindex f2780447a4..0bad05817c 100644--- 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.html@@ -5,7 +5,7 @@<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>+ <input type="submit" value="Ok" class="btn btn-primary dirty-aware"></input></div></form></div>diff --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.javaindex 9e7633841e..34bcf2e63c 100644--- 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.java@@ -1,7 +1,5 @@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;@@ -12,6 +10,7 @@ import io.onedev.server.OneDev;import io.onedev.server.manager.MilestoneManager;import io.onedev.server.model.Milestone;import io.onedev.server.model.Project;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;import io.onedev.server.web.editable.PathSegment;@@ -30,7 +29,6 @@ public class NewMilestonePage extends IssuesPage {super.onInitialize();Milestone milestone = new Milestone();- milestone.setUpdateDate(new Date());BeanEditor editor = BeanContext.editBean("editor", milestone);Form<?> form = new Form<Void>("form") {@@ -49,7 +47,7 @@ public class NewMilestonePage extends IssuesPage {milestone.setProject(getProject());milestoneManager.save(milestone);Session.get().success("New milestone created");- setResponsePage(MilestoneListPage.class, MilestoneListPage.paramsOf(getProject(), false, null));+ setResponsePage(MilestoneDetailPage.class, MilestoneDetailPage.paramsOf(milestone, null));}}@@ -69,4 +67,9 @@ public class NewMilestonePage extends IssuesPage {return ProjectPage.paramsOf(project);}+ @Override+ protected boolean isPermitted() {+ return SecurityUtils.canManage(getProject());+ }+}