The Unified and Autonomous Development Platform
feat: Able to show all issues for all milestones in board (OD-1947)
Robin Shen088ca2829bf2
diff --git a/server-core/src/main/java/io/onedev/server/annotation/MilestoneName.java b/server-core/src/main/java/io/onedev/server/annotation/MilestoneName.javadeleted file mode 100644index d6de097867..0000000000--- a/server-core/src/main/java/io/onedev/server/annotation/MilestoneName.java+++ /dev/null@@ -1,23 +0,0 @@-package io.onedev.server.annotation;--import java.lang.annotation.ElementType;-import java.lang.annotation.Retention;-import java.lang.annotation.RetentionPolicy;-import java.lang.annotation.Target;--import javax.validation.Constraint;-import javax.validation.Payload;--import io.onedev.server.validation.validator.ProjectNameValidator;--@Target({ElementType.METHOD, ElementType.FIELD})-@Retention(RetentionPolicy.RUNTIME)-@Constraint(validatedBy=ProjectNameValidator.class)-public @interface MilestoneName {-- String message() default "";-- Class<?>[] groups() default {};-- Class<? extends Payload>[] payload() default {};-}diff --git a/server-core/src/main/java/io/onedev/server/model/Milestone.java b/server-core/src/main/java/io/onedev/server/model/Milestone.javaindex 698f278a65..5e1cebea57 100644--- a/server-core/src/main/java/io/onedev/server/model/Milestone.java+++ b/server-core/src/main/java/io/onedev/server/model/Milestone.java@@ -31,8 +31,6 @@ public class Milestone extends AbstractEntity {public static final String PROP_CLOSED = "closed";- public static final String NONE = "[none]";-@ManyToOne@JoinColumn(nullable=false)@Immutablediff --git a/server-core/src/main/java/io/onedev/server/validation/validator/MilestoneNameValidator.java b/server-core/src/main/java/io/onedev/server/validation/validator/MilestoneNameValidator.javadeleted file mode 100644index 8544b76922..0000000000--- a/server-core/src/main/java/io/onedev/server/validation/validator/MilestoneNameValidator.java+++ /dev/null@@ -1,35 +0,0 @@-package io.onedev.server.validation.validator;--import javax.validation.ConstraintValidator;-import javax.validation.ConstraintValidatorContext;--import io.onedev.server.model.Milestone;-import io.onedev.server.annotation.MilestoneName;--public class MilestoneNameValidator implements ConstraintValidator<MilestoneName, String> {-- private String message;-- @Override- public void initialize(MilestoneName constaintAnnotation) {- message = constaintAnnotation.message();- }-- @Override- public boolean isValid(String value, ConstraintValidatorContext constraintContext) {- if (value == null)- return true;-- if (value.equals(Milestone.NONE)) {- constraintContext.disableDefaultConstraintViolation();- String message = this.message;- if (message.length() == 0)- message = "'" + value + "' is a reserved name";- constraintContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();- return false;- } else {- return true;- }- }--}diff --git a/server-core/src/main/java/io/onedev/server/web/asset/icon/all.svg b/server-core/src/main/java/io/onedev/server/web/asset/icon/all.svgnew file mode 100644index 0000000000..a7dedead49--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/asset/icon/all.svg@@ -0,0 +1 @@+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1718615322018" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2344" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M170.688 96c-41.28 0-74.688 33.408-74.688 74.688V384c0 41.216 33.408 74.688 74.688 74.688H384c41.216 0 74.688-33.472 74.688-74.688V170.688C458.688 129.408 425.216 96 384 96H170.688z m0 469.312C129.408 565.312 96 598.784 96 640v213.312c0 41.28 33.408 74.688 74.688 74.688H384c41.216 0 74.688-33.408 74.688-74.688V640c0-41.216-33.472-74.688-74.688-74.688H170.688zM640 96c-41.216 0-74.688 33.408-74.688 74.688V384c0 41.216 33.472 74.688 74.688 74.688h213.312c41.28 0 74.688-33.472 74.688-74.688V170.688c0-41.28-33.408-74.688-74.688-74.688H640z m0 469.312c-41.216 0-74.688 33.472-74.688 74.688v213.312c0 41.28 33.472 74.688 74.688 74.688h213.312c41.28 0 74.688-33.408 74.688-74.688V640c0-41.216-33.408-74.688-74.688-74.688H640z" p-id="2345"></path></svg>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/AbstractColumnPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/AbstractColumnPanel.javaindex 5b51ac6083..e8fbe2d2ab 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/AbstractColumnPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/AbstractColumnPanel.java@@ -6,13 +6,11 @@ import io.onedev.server.entitymanager.IssueChangeManager;import io.onedev.server.entitymanager.IssueManager;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.Issue;-import io.onedev.server.model.Milestone;import io.onedev.server.model.Project;import io.onedev.server.model.support.administration.GlobalIssueSetting;import io.onedev.server.search.entity.issue.IssueQuery;import io.onedev.server.util.EditContext;import io.onedev.server.util.ProjectScope;-import io.onedev.server.web.page.base.BasePage;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.markup.repeater.RepeatingView;@@ -91,7 +89,9 @@ abstract class AbstractColumnPanel extends Panel implements EditContext {protected abstract ProjectScope getProjectScope();+ protected abstract MilestoneSelection getMilestoneSelection();+@Nullable- protected abstract Milestone getMilestone();+ protected abstract String getMilestonePrefix();}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BacklogColumnPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BacklogColumnPanel.javaindex 5de666deb8..df67cfaa41 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BacklogColumnPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BacklogColumnPanel.java@@ -3,12 +3,11 @@ package io.onedev.server.web.page.project.issues.boards;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;import io.onedev.server.search.entity.issue.IssueQuery;-import io.onedev.server.search.entity.issue.IssueQueryLexer;import io.onedev.server.search.entity.issue.MilestoneCriteria;+import io.onedev.server.search.entity.issue.MilestoneEmptyCriteria;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.ProjectScope;import io.onedev.server.util.criteria.Criteria;-import io.onedev.server.util.criteria.NotCriteria;import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;import io.onedev.server.web.component.floating.FloatingPanel;import io.onedev.server.web.component.issue.create.CreateIssuePanel;@@ -40,7 +39,8 @@ import java.util.ArrayList;import java.util.Date;import java.util.List;-import static io.onedev.server.search.entity.issue.IssueQueryLexer.Is;+import static io.onedev.server.search.entity.issue.IssueQueryLexer.IsEmpty;+import static io.onedev.server.search.entity.issue.IssueQueryLexer.IsNot;import static io.onedev.server.security.SecurityUtils.canManageIssues;import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit;@@ -56,7 +56,10 @@ abstract class BacklogColumnPanel extends AbstractColumnPanel {List<Criteria<Issue>> criterias = new ArrayList<>();if (backlogQuery.getCriteria() != null)criterias.add(backlogQuery.getCriteria());- criterias.add(new NotCriteria<>(new MilestoneCriteria(getMilestone().getName(), Is)));+ if (getMilestonePrefix() != null)+ criterias.add(new MilestoneCriteria(getMilestonePrefix() + "*", IsNot));+ else+ criterias.add(new MilestoneEmptyCriteria(IsEmpty));return new IssueQuery(Criteria.andCriterias(criterias), backlogQuery.getSorts());} else {return null;@@ -161,7 +164,7 @@ abstract class BacklogColumnPanel extends AbstractColumnPanel {var card = cardListPanel.findCard(issueId);if (card == null) { // moved from other columnsvar issue = getIssueManager().load(issueId);- getIssueChangeManager().removeSchedule(issue, getMilestone());+ getIssueChangeManager().removeSchedule(issue, getMilestoneSelection().getMilestone());}cardListPanel.onCardDropped(target, issueId, cardIndex, true);}@@ -183,7 +186,7 @@ abstract class BacklogColumnPanel extends AbstractColumnPanel {Issue issue = issueDragging.getIssue();if (SecurityUtils.canScheduleIssues(issue.getProject())) {issue = SerializationUtils.clone(issue);- issue.removeSchedule(getMilestone());+ issue.removeSchedule(getMilestoneSelection().getMilestone());issue.getLastActivity().setDate(new Date());}if (getQuery().matches(issue)) {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.javaindex a13522c1fb..71f54bb9ff 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java@@ -61,8 +61,7 @@ import java.io.Serializable;import java.util.*;import java.util.concurrent.atomic.AtomicReference;-import static io.onedev.server.search.entity.issue.IssueQueryLexer.Is;-import static io.onedev.server.search.entity.issue.IssueQueryLexer.IsEmpty;+import static io.onedev.server.search.entity.issue.IssueQueryLexer.*;import static io.onedev.server.security.SecurityUtils.canManageIssues;import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit;@@ -78,10 +77,14 @@ abstract class BoardColumnPanel extends AbstractColumnPanel {List<Criteria<Issue>> criterias = new ArrayList<>();if (boardQuery.getCriteria() != null)criterias.add(boardQuery.getCriteria());- if (getMilestone() != null)- criterias.add(new MilestoneCriteria(getMilestone().getName(), Is));- else- criterias.add(new MilestoneEmptyCriteria(IsEmpty));+ if (getMilestoneSelection().getMilestone() != null) {+ criterias.add(new MilestoneCriteria(getMilestoneSelection().getMilestone().getName(), Is));+ } else if (getMilestoneSelection() instanceof MilestoneSelection.Unscheduled) {+ if (getMilestonePrefix() != null)+ criterias.add(new MilestoneCriteria(getMilestonePrefix()+ "*", IsNot));+ else+ criterias.add(new MilestoneEmptyCriteria(IsEmpty));+ }String identifyField = getBoard().getIdentifyField();if (identifyField.equals(Issue.NAME_STATE)) {criterias.add(new StateCriteria(getColumn(), Is));@@ -136,7 +139,8 @@ abstract class BoardColumnPanel extends AbstractColumnPanel {if (event.getPayload() instanceof IssueDragging && getQuery() != null) {IssueDragging issueDragging = (IssueDragging) event.getPayload();Issue issue = issueDragging.getIssue();- if (getMilestone() == null || issue.getMilestones().contains(getMilestone())) {+ var milestone = getMilestoneSelection().getMilestone();+ if (milestone == null || issue.getMilestones().contains(milestone)) {// move issue between board columnsString identifyField = getBoard().getIdentifyField();if (identifyField.equals(Issue.NAME_STATE)) {@@ -162,7 +166,7 @@ abstract class BoardColumnPanel extends AbstractColumnPanel {issue.setProject(getProjectScope().getProject());IssueSchedule schedule = new IssueSchedule();schedule.setIssue(issue);- schedule.setMilestone(getMilestone());+ schedule.setMilestone(milestone);issue.getSchedules().add(schedule);issue.getLastActivity().setDate(new Date());}@@ -348,8 +352,9 @@ abstract class BoardColumnPanel extends AbstractColumnPanel {} else {Issue issue = getIssueManager().load(issueId);String fieldName = getBoard().getIdentifyField();- if (getMilestone() != null && !issue.getMilestones().contains(getMilestone())) {- getIssueChangeManager().addSchedule(issue, getMilestone());+ var milestone = getMilestoneSelection().getMilestone();+ if (milestone != null && !issue.getMilestones().contains(milestone)) {+ getIssueChangeManager().addSchedule(issue, milestone);cardListPanel.onCardDropped(target, issueId, cardIndex, true);} else if (fieldName.equals(Issue.NAME_STATE)) {AtomicReference<TransitionSpec> transitionRef = new AtomicReference<>(null);diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.htmlindex 52ad048e29..d023fbbe52 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.html@@ -81,7 +81,8 @@</table></wicket:enclosure><a wicket:id="showClosed" class="show-closed btn btn-block btn-light btn-hover-primary btn-sm"><wicket:svg href="double-arrow" class="icon rotate-90 mr-2"></wicket:svg> Show Closed</a>- <a wicket:id="unscheduled" class="no-milestone btn btn-block btn-light btn-hover-primary btn-sm"><wicket:svg href="inbox" class="icon mr-2"></wicket:svg> Unscheduled</a>+ <a wicket:id="unscheduled" class="no-milestone btn btn-block btn-light btn-hover-primary btn-sm"><wicket:svg href="inbox" class="icon mr-2"></wicket:svg> Unscheduled Issues</a>+ <a wicket:id="all" class="all btn btn-block btn-light btn-hover-primary btn-sm"><wicket:svg href="all" class="icon mr-2"></wicket:svg> All Issues</a><a wicket:id="newMilestone" class="new-milestone btn btn-block btn-light btn-hover-primary btn-sm"><wicket:svg href="plus" class="icon mr-2"></wicket:svg> Create Milestone</a></div></wicket:fragment>diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.javaindex 74447ba21f..5fb3ea0bcd 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.java@@ -31,6 +31,7 @@ import io.onedev.server.web.page.project.issues.ProjectIssuesPage;import io.onedev.server.web.util.ConfirmClickModifier;import io.onedev.server.web.util.editbean.MilestoneEditBean;import org.apache.commons.lang3.StringUtils;+import org.apache.commons.lang3.math.NumberUtils;import org.apache.wicket.Component;import org.apache.wicket.Session;import org.apache.wicket.ajax.AjaxRequestTarget;@@ -79,11 +80,15 @@ public class IssueBoardsPage extends ProjectIssuesPage {private static final String PARAM_BACKLOG_QUERY = "backlog-query";+ private static final String MILESTONE_ALL = "all";++ public static final String MILESTONE_UNSCHEDULED = "unscheduled";+private List<BoardSpec> boards;private final int boardIndex;- private final IModel<Milestone> milestoneModel;+ private final IModel<MilestoneSelection> milestoneSelectionModel;private final boolean backlog;@@ -173,36 +178,39 @@ public class IssueBoardsPage extends ProjectIssuesPage {boardIndex = -1;}- Milestone milestone;- String milestoneName = params.get(PARAM_MILESTONE).toString();- if (milestoneName != null) {- if (milestoneName.equals(Milestone.NONE) || getBoard().getMilestonePrefix() != null && !milestoneName.startsWith(getBoard().getMilestonePrefix())) {- milestone = null;- } else {- milestone = getProject().getHierarchyMilestone(milestoneName);- if (milestone == null)- throw new ExplicitException("Can not find milestone: " + milestoneName);+ var milestoneParam = params.get(PARAM_MILESTONE).toString();+ milestoneSelectionModel = new LoadableDetachableModel<>() {++ private MilestoneSelection getCurrentMilestone() {+ if (!getMilestones().isEmpty()) {+ var milestone = getMilestones().iterator().next();+ if (!milestone.isClosed())+ return new MilestoneSelection.Specified(milestone);+ }+ return new MilestoneSelection.Unscheduled();}- } else if (!getMilestones().isEmpty()) {- milestone = getMilestones().iterator().next();- } else {- milestone = null;- }-- Long milestoneId = Milestone.idOf(milestone);- milestoneModel = new LoadableDetachableModel<>() {-+@Override- protected Milestone load() {- if (milestoneId != null)- return getMilestoneManager().load(milestoneId);- else- return null;+ protected MilestoneSelection load() {+ if (MILESTONE_UNSCHEDULED.equals(milestoneParam)) {+ return new MilestoneSelection.Unscheduled();+ } else if (MILESTONE_ALL.equals(milestoneParam)) {+ return new MilestoneSelection.All();+ } else if (NumberUtils.isDigits(milestoneParam)) {+ var milestone = getMilestoneManager().load(Long.valueOf(milestoneParam));+ if (getBoard().getMilestonePrefix() != null && !milestone.getName().startsWith(getBoard().getMilestonePrefix())+ || !milestone.getProject().isSelfOrAncestorOf(getProject())) {+ return getCurrentMilestone();+ } else {+ return new MilestoneSelection.Specified(milestone);+ }+ } else {+ return getCurrentMilestone();+ }}-};- backlog = params.get(PARAM_BACKLOG).toBoolean() && getMilestone() != null;+ backlog = params.get(PARAM_BACKLOG).toBoolean() && getMilestoneSelection().getMilestone() != null;queryString = params.get(PARAM_QUERY).toString();backlogQueryString = params.get(PARAM_BACKLOG_QUERY).toString();}@@ -213,7 +221,7 @@ public class IssueBoardsPage extends ProjectIssuesPage {@Overrideprotected void onDetach() {- milestoneModel.detach();+ milestoneSelectionModel.detach();queryModel.detach();backlogQueryModel.detach();super.onDetach();@@ -227,9 +235,8 @@ public class IssueBoardsPage extends ProjectIssuesPage {return null;}- @Nullable- public Milestone getMilestone() {- return milestoneModel.getObject();+ public MilestoneSelection getMilestoneSelection() {+ return milestoneSelectionModel.getObject();}private void doQuery(AjaxRequestTarget target) {@@ -242,7 +249,7 @@ public class IssueBoardsPage extends ProjectIssuesPage {}PageParameters params = IssueBoardsPage.paramsOf(getProject(), getBoard(),- getMilestone(), backlog, queryString, backlogQueryString);+ getMilestoneSelection(), backlog, queryString, backlogQueryString);CharSequence url = RequestCycle.get().urlFor(IssueBoardsPage.class, params);pushState(target, url.toString(), queryInput.getModelObject());@@ -297,15 +304,9 @@ public class IssueBoardsPage extends ProjectIssuesPage {protected void populateItem(ListItem<BoardSpec> item) {item.add(new WebMarkupContainer("dragIndicator").setVisible(SecurityUtils.canManageIssues(getProject())));- PageParameters params;- if (Milestone.NONE.equals(getPageParameters().get(PARAM_MILESTONE).toString())) {- params = IssueBoardsPage.paramsOfUnscheduled(- getProject(), item.getModelObject(), backlog, backlogQueryString, queryString);- } else {- params = IssueBoardsPage.paramsOf(- getProject(), item.getModelObject(), getMilestone(), backlog,+ PageParameters params = IssueBoardsPage.paramsOf(+ getProject(), item.getModelObject(), getMilestoneSelection(), backlog,backlogQueryString, queryString);- }Link<Void> link = new BookmarkablePageLink<Void>("select", IssueBoardsPage.class, params);link.add(new Label("name", item.getModelObject().getName()));item.add(link);@@ -348,7 +349,7 @@ public class IssueBoardsPage extends ProjectIssuesPage {elsenextBoard = currentBoard;PageParameters params = IssueBoardsPage.paramsOf(getProject(),- nextBoard, getMilestone(), backlog, queryString,+ nextBoard, getMilestoneSelection(), backlog, queryString,backlogQueryString);setResponsePage(IssueBoardsPage.class, params);}@@ -405,7 +406,7 @@ public class IssueBoardsPage extends ProjectIssuesPage {@Overridepublic void onClick(AjaxRequestTarget target) {- PageParameters params = paramsOf(getProject(), getBoard(), getMilestone(),+ PageParameters params = paramsOf(getProject(), getBoard(), getMilestoneSelection(),!backlog, queryString, backlogQueryString);setResponsePage(IssueBoardsPage.class, params);}@@ -413,7 +414,7 @@ public class IssueBoardsPage extends ProjectIssuesPage {@Overrideprotected void onConfigure() {super.onConfigure();- setVisible(getMilestone() != null);+ setVisible(getMilestoneSelection().getMilestone() != null);}});@@ -426,20 +427,23 @@ public class IssueBoardsPage extends ProjectIssuesPage {protected void onInitialize() {super.onInitialize();- if (getMilestone() != null) {- add(new Label("label", getMilestone().getName()));-- if (getMilestone().getDueDate() != null- && getMilestone().getDueDate().before(new Date())- && !getMilestone().isClosed()) {+ if (getMilestoneSelection() instanceof MilestoneSelection.All) {+ add(new Label("label", "<i>All</i>").setEscapeModelStrings(false));+ add(AttributeAppender.append("class", "btn-outline-secondary btn-hover-primary"));+ } else if (getMilestoneSelection() instanceof MilestoneSelection.Unscheduled) {+ add(new Label("label", "<i>Unscheduled</i>").setEscapeModelStrings(false));+ add(AttributeAppender.append("class", "btn-outline-secondary btn-hover-primary"));+ } else {+ var milestone = getMilestoneSelection().getMilestone();+ add(new Label("label", milestone.getName()));+ if (milestone.getDueDate() != null+ && milestone.getDueDate().before(new Date())+ && !milestone.isClosed()) {add(AttributeAppender.append("class", "btn-danger"));add(AttributeAppender.replace("title", "Milestone is due"));} else {add(AttributeAppender.append("class", "btn-outline-secondary btn-hover-primary"));}- } else {- add(new Label("label", "<i>Unscheduled</i>").setEscapeModelStrings(false));- add(AttributeAppender.append("class", "btn-outline-secondary btn-hover-primary"));}}@@ -457,7 +461,7 @@ public class IssueBoardsPage extends ProjectIssuesPage {.stream().filter(it -> !it.isClosed()).collect(toList());- if (getMilestone() != null && getMilestone().isClosed() || showClosed) {+ if (getMilestoneSelection().getMilestone() != null && getMilestoneSelection().getMilestone().isClosed() || showClosed) {List<Milestone> closedMilestones = getMilestones().stream().filter(it -> it.isClosed())@@ -471,10 +475,10 @@ public class IssueBoardsPage extends ProjectIssuesPage {private void toggleClose(Milestone milestone) {milestone.setClosed(!milestone.isClosed());- if (milestone.equals(IssueBoardsPage.this.getMilestone())) {+ if (milestone.equals(getMilestoneSelection().getMilestone())) {getMilestoneManager().createOrUpdate(milestone);setResponsePage(IssueBoardsPage.class, IssueBoardsPage.paramsOf(getProject(), getBoard(),- milestone, backlog, queryString, backlogQueryString));+ getMilestoneSelection(), backlog, queryString, backlogQueryString));} else {getMilestoneManager().createOrUpdate(milestone);}@@ -488,8 +492,8 @@ public class IssueBoardsPage extends ProjectIssuesPage {@Overrideprotected void populateItem(ListItem<Milestone> item) {Milestone milestone = item.getModelObject();- PageParameters params = IssueBoardsPage.paramsOf(getProject(), getBoard(), milestone,- backlog, queryString, backlogQueryString);+ PageParameters params = IssueBoardsPage.paramsOf(getProject(), getBoard(),+ new MilestoneSelection.Specified(milestone), backlog, queryString, backlogQueryString);Link<Void> link = new BookmarkablePageLink<Void>("select", IssueBoardsPage.class, params);link.add(new Label("name", milestone.getName()));item.add(link);@@ -554,8 +558,8 @@ public class IssueBoardsPage extends ProjectIssuesPage {bean.update(milestone);getMilestoneManager().createOrUpdate(milestone);setResponsePage(IssueBoardsPage.class, IssueBoardsPage.paramsOf(- getProject(), getBoard(), milestone, backlog, queryString,- backlogQueryString));+ getProject(), getBoard(), new MilestoneSelection.Specified(milestone),+ backlog, queryString, backlogQueryString));}};}@@ -574,11 +578,11 @@ public class IssueBoardsPage extends ProjectIssuesPage {public void onClick(AjaxRequestTarget target) {dropdown.close();Milestone milestone = item.getModelObject();- if (milestone.equals(IssueBoardsPage.this.getMilestone())) {+ if (milestone.equals(getMilestoneSelection().getMilestone())) {getMilestoneManager().delete(milestone);PageParameters params = IssueBoardsPage.paramsOf(- getProject(), getBoard(), null, backlog, queryString,- backlogQueryString);+ getProject(), getBoard(), new MilestoneSelection.Unscheduled(),+ backlog, queryString, backlogQueryString);setResponsePage(IssueBoardsPage.class, params);} else {getMilestoneManager().delete(milestone);@@ -613,22 +617,25 @@ public class IssueBoardsPage extends ProjectIssuesPage {@Overrideprotected void onConfigure() {super.onConfigure();- setVisible(!showClosed && (getMilestone() == null || !getMilestone().isClosed())+ setVisible(!showClosed+ && (getMilestoneSelection().getMilestone() == null || !getMilestoneSelection().getMilestone().isClosed())&& getMilestones().stream().anyMatch(Milestone::isClosed));}});- PageParameters params = IssueBoardsPage.paramsOfUnscheduled(getProject(), getBoard(),+ PageParameters params = IssueBoardsPage.paramsOf(getProject(), getBoard(), new MilestoneSelection.Unscheduled(),backlog, queryString, backlogQueryString);-- menuFragment.add(new BookmarkablePageLink<Void>("unscheduled", IssueBoardsPage.class, params) {+ menuFragment.add(new BookmarkablePageLink<Void>("unscheduled", IssueBoardsPage.class, params));+ params = IssueBoardsPage.paramsOf(getProject(), getBoard(), new MilestoneSelection.All(),+ backlog, queryString, backlogQueryString);+ menuFragment.add(new BookmarkablePageLink<Void>("all", IssueBoardsPage.class, params) {@Overrideprotected void onConfigure() {super.onConfigure();+ setVisible(!getMilestones().isEmpty());}-});menuFragment.add(new AjaxLink<Void>("newMilestone") {@@ -646,8 +653,13 @@ public class IssueBoardsPage extends ProjectIssuesPage {bean.update(milestone);getMilestoneManager().createOrUpdate(milestone);setResponsePage(IssueBoardsPage.class, IssueBoardsPage.paramsOf(- getProject(), getBoard(), milestone, backlog, queryString,- backlogQueryString));+ getProject(), getBoard(), new MilestoneSelection.Specified(milestone),+ backlog, queryString, backlogQueryString));+ }++ @Override+ protected boolean isDirtyAware() {+ return false;}};}@@ -738,8 +750,13 @@ public class IssueBoardsPage extends ProjectIssuesPage {}@Override- protected Milestone getMilestone() {- return IssueBoardsPage.this.getMilestone();+ protected MilestoneSelection getMilestoneSelection() {+ return IssueBoardsPage.this.getMilestoneSelection();+ }++ @Override+ protected String getMilestonePrefix() {+ return getBoard().getMilestonePrefix();}});@@ -759,8 +776,13 @@ public class IssueBoardsPage extends ProjectIssuesPage {}@Override- protected Milestone getMilestone() {- return IssueBoardsPage.this.getMilestone();+ protected MilestoneSelection getMilestoneSelection() {+ return IssueBoardsPage.this.getMilestoneSelection();+ }++ @Override+ protected String getMilestonePrefix() {+ return getBoard().getMilestonePrefix();}@Override@@ -838,28 +860,18 @@ public class IssueBoardsPage extends ProjectIssuesPage {.collect(toList());}- public static PageParameters paramsOf(Project project, @Nullable BoardSpec board,- @Nullable Milestone milestone, boolean backlog, @Nullable String query,- @Nullable String backlogQuery) {+ public static PageParameters paramsOf(Project project, @Nullable BoardSpec board,+ MilestoneSelection milestoneSelection, boolean backlog,+ @Nullable String query, @Nullable String backlogQuery) {PageParameters params = paramsOf(project);if (board != null)params.add(PARAM_BOARD, board.getName());- if (milestone != null)- params.add(PARAM_MILESTONE, milestone.getName());- params.add(PARAM_BACKLOG, backlog);- if (query != null)- params.add(PARAM_QUERY, query);- if (backlogQuery != null)- params.add(PARAM_BACKLOG_QUERY, backlogQuery);- return params;- }-- public static PageParameters paramsOfUnscheduled(Project project, @Nullable BoardSpec board,- boolean backlog, @Nullable String query, @Nullable String backlogQuery) {- PageParameters params = paramsOf(project);- if (board != null)- params.add(PARAM_BOARD, board.getName());- params.add(PARAM_MILESTONE, Milestone.NONE);+ if (milestoneSelection instanceof MilestoneSelection.All)+ params.add(PARAM_MILESTONE, MILESTONE_ALL);+ else if (milestoneSelection instanceof MilestoneSelection.Unscheduled)+ params.add(PARAM_MILESTONE, MILESTONE_UNSCHEDULED);+ else+ params.add(PARAM_MILESTONE, milestoneSelection.getMilestone().getId());params.add(PARAM_BACKLOG, backlog);if (query != null)params.add(PARAM_QUERY, query);@@ -886,7 +898,7 @@ public class IssueBoardsPage extends ProjectIssuesPage {@Overrideprotected void onBoardCreated(AjaxRequestTarget target, BoardSpec board) {setResponsePage(IssueBoardsPage.class, IssueBoardsPage.paramsOf(- getProject(), board, getMilestone(), backlog, queryString,+ getProject(), board, getMilestoneSelection(), backlog, queryString,backlogQueryString));modal.close();}@@ -919,7 +931,7 @@ public class IssueBoardsPage extends ProjectIssuesPage {getProject().getIssueSetting().setBoardSpecs(boards);OneDev.getInstance(ProjectManager.class).update(getProject());setResponsePage(IssueBoardsPage.class, IssueBoardsPage.paramsOf(- getProject(), board, getMilestone(), backlog, queryString,+ getProject(), board, getMilestoneSelection(), backlog, queryString,backlogQueryString));}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/MilestoneSelection.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/MilestoneSelection.javanew file mode 100644index 0000000000..a413924be0--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/MilestoneSelection.java@@ -0,0 +1,39 @@+package io.onedev.server.web.page.project.issues.boards;++import io.onedev.server.model.Milestone;++import javax.annotation.Nullable;++public interface MilestoneSelection {++ @Nullable+ Milestone getMilestone();++ class Specified implements MilestoneSelection {++ private final Milestone milestone;++ public Specified(Milestone milestone) {+ this.milestone = milestone;+ }++ @Override+ public Milestone getMilestone() {+ return milestone;+ }+ }++ class Unscheduled implements MilestoneSelection {+ @Override+ public Milestone getMilestone() {+ return null;+ }+ }++ class All implements MilestoneSelection {+ @Override+ public Milestone getMilestone() {+ return null;+ }+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/NewMilestonePage.html b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/NewMilestonePage.htmlindex 13097aadf7..8bd244bf1c 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/NewMilestonePage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/NewMilestonePage.html@@ -4,7 +4,7 @@<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>+ <input type="submit" value="Save" class="btn btn-primary"></div></form></div>diff --git a/server-core/src/main/java/io/onedev/server/web/util/editbean/MilestoneEditBean.java b/server-core/src/main/java/io/onedev/server/web/util/editbean/MilestoneEditBean.javaindex a20f7fc773..95ce0ed7b4 100644--- a/server-core/src/main/java/io/onedev/server/web/util/editbean/MilestoneEditBean.java+++ b/server-core/src/main/java/io/onedev/server/web/util/editbean/MilestoneEditBean.java@@ -105,7 +105,7 @@ public class MilestoneEditBean implements Validatable, Serializable {var bean = new MilestoneEditBean();bean.namePrefix = namePrefix;var milestones = project.getSortedHierarchyMilestones().stream()- .filter(it -> (namePrefix == null || it.getName().startsWith(namePrefix)) && it.getStartDate() != null && it.getDueDate() != null)+ .filter(it -> (namePrefix == null || it.getName().startsWith(namePrefix))).collect(toList());if (!milestones.isEmpty()) {var lastMilestone = milestones.get(milestones.size()-1);