The Unified and Autonomous Development Platform
Update milestone list when close a milestone
Robin Shene5743d5994a4
diff --git a/server-core/src/main/java/io/onedev/server/web/component/milestone/closelink/ConfirmCloseWithOpenIssuesPanel.html b/server-core/src/main/java/io/onedev/server/web/component/milestone/closelink/ConfirmCloseWithTodoIssuesPanel.htmlsimilarity index 100%rename from server-core/src/main/java/io/onedev/server/web/component/milestone/closelink/ConfirmCloseWithOpenIssuesPanel.htmlrename to server-core/src/main/java/io/onedev/server/web/component/milestone/closelink/ConfirmCloseWithTodoIssuesPanel.htmldiff --git a/server-core/src/main/java/io/onedev/server/web/component/milestone/closelink/ConfirmCloseWithOpenIssuesPanel.java b/server-core/src/main/java/io/onedev/server/web/component/milestone/closelink/ConfirmCloseWithTodoIssuesPanel.javasimilarity index 93%rename from server-core/src/main/java/io/onedev/server/web/component/milestone/closelink/ConfirmCloseWithOpenIssuesPanel.javarename to server-core/src/main/java/io/onedev/server/web/component/milestone/closelink/ConfirmCloseWithTodoIssuesPanel.javaindex 10d6d5ef1a..e618df4053 100644--- a/server-core/src/main/java/io/onedev/server/web/component/milestone/closelink/ConfirmCloseWithOpenIssuesPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/milestone/closelink/ConfirmCloseWithTodoIssuesPanel.java@@ -17,9 +17,9 @@ import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.page.project.issues.milestones.MilestoneCloseOption;@SuppressWarnings("serial")-abstract class ConfirmCloseWithOpenIssuesPanel extends Panel {+abstract class ConfirmCloseWithTodoIssuesPanel extends Panel {- public ConfirmCloseWithOpenIssuesPanel(String id) {+ public ConfirmCloseWithTodoIssuesPanel(String id) {super(id);}@@ -58,7 +58,7 @@ abstract class ConfirmCloseWithOpenIssuesPanel extends Panel {protected void onSubmit(AjaxRequestTarget target, Form<?> form) {super.onSubmit(target, form);MilestoneManager milestoneManager = OneDev.getInstance(MilestoneManager.class);- if (option.isMoveOpenIssuesToAnotherMilestone()) {+ if (option.isMoveTodoIssuesToAnotherMilestone()) {Milestone newMilestone = milestoneManager.find(getMilestone().getProject(), option.getNewMilestone());Preconditions.checkNotNull(newMilestone);milestoneManager.close(getMilestone(), newMilestone);diff --git a/server-core/src/main/java/io/onedev/server/web/component/milestone/closelink/ConfirmCloseWithoutOpenIssuesPanel.html b/server-core/src/main/java/io/onedev/server/web/component/milestone/closelink/ConfirmCloseWithoutTodoIssuesPanel.htmlsimilarity index 100%rename from server-core/src/main/java/io/onedev/server/web/component/milestone/closelink/ConfirmCloseWithoutOpenIssuesPanel.htmlrename to server-core/src/main/java/io/onedev/server/web/component/milestone/closelink/ConfirmCloseWithoutTodoIssuesPanel.htmldiff --git a/server-core/src/main/java/io/onedev/server/web/component/milestone/closelink/ConfirmCloseWithoutOpenIssuesPanel.java b/server-core/src/main/java/io/onedev/server/web/component/milestone/closelink/ConfirmCloseWithoutTodoIssuesPanel.javasimilarity index 87%rename from server-core/src/main/java/io/onedev/server/web/component/milestone/closelink/ConfirmCloseWithoutOpenIssuesPanel.javarename to server-core/src/main/java/io/onedev/server/web/component/milestone/closelink/ConfirmCloseWithoutTodoIssuesPanel.javaindex 439c124137..c77db7214b 100644--- a/server-core/src/main/java/io/onedev/server/web/component/milestone/closelink/ConfirmCloseWithoutOpenIssuesPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/milestone/closelink/ConfirmCloseWithoutTodoIssuesPanel.java@@ -10,9 +10,9 @@ import io.onedev.server.entitymanager.MilestoneManager;import io.onedev.server.model.Milestone;@SuppressWarnings("serial")-abstract class ConfirmCloseWithoutOpenIssuesPanel extends Panel {+abstract class ConfirmCloseWithoutTodoIssuesPanel extends Panel {- public ConfirmCloseWithoutOpenIssuesPanel(String id) {+ public ConfirmCloseWithoutTodoIssuesPanel(String id) {super(id);}@@ -26,7 +26,7 @@ abstract class ConfirmCloseWithoutOpenIssuesPanel extends Panel {@Overridepublic void onClick(AjaxRequestTarget target) {OneDev.getInstance(MilestoneManager.class).close(getMilestone(), null);- onClose(target);+ onMilestoneClosed(target);}});diff --git a/server-core/src/main/java/io/onedev/server/web/component/milestone/closelink/MilestoneCloseLink.java b/server-core/src/main/java/io/onedev/server/web/component/milestone/closelink/MilestoneCloseLink.javaindex e06642c6dd..c48691133a 100644--- a/server-core/src/main/java/io/onedev/server/web/component/milestone/closelink/MilestoneCloseLink.java+++ b/server-core/src/main/java/io/onedev/server/web/component/milestone/closelink/MilestoneCloseLink.java@@ -21,7 +21,7 @@ public abstract class MilestoneCloseLink extends ModalLink {@Overrideprotected Component newContent(String id, ModalPanel modal) {if (OneDev.getInstance(IssueManager.class).count(getMilestone(), false) != 0) {- return new ConfirmCloseWithOpenIssuesPanel(id) {+ return new ConfirmCloseWithTodoIssuesPanel(id) {@Overrideprotected Milestone getMilestone() {@@ -41,7 +41,7 @@ public abstract class MilestoneCloseLink extends ModalLink {};} else {- return new ConfirmCloseWithoutOpenIssuesPanel(id) {+ return new ConfirmCloseWithoutTodoIssuesPanel(id) {@Overrideprotected Milestone getMilestone() {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneCloseOption.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneCloseOption.javaindex 9eceefcad9..3476f76630 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneCloseOption.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneCloseOption.java@@ -20,7 +20,7 @@ public class MilestoneCloseOption implements Serializable {private static final long serialVersionUID = 1L;- private boolean moveOpenIssuesToAnotherMilestone = true;+ private boolean moveTodoIssuesToAnotherMilestone = true;private String milestoneToClose;@@ -36,12 +36,12 @@ public class MilestoneCloseOption implements Serializable {}@Editable- public boolean isMoveOpenIssuesToAnotherMilestone() {- return moveOpenIssuesToAnotherMilestone;+ public boolean isMoveTodoIssuesToAnotherMilestone() {+ return moveTodoIssuesToAnotherMilestone;}- public void setMoveOpenIssuesToAnotherMilestone(boolean moveOpenIssuesToAnotherMilestone) {- this.moveOpenIssuesToAnotherMilestone = moveOpenIssuesToAnotherMilestone;+ public void setMoveTodoIssuesToAnotherMilestone(boolean moveTodoIssuesToAnotherMilestone) {+ this.moveTodoIssuesToAnotherMilestone = moveTodoIssuesToAnotherMilestone;}@Editable(order=200, name="Another Open Milestone")@@ -59,7 +59,7 @@ public class MilestoneCloseOption implements Serializable {@SuppressWarnings("unused")private static boolean isNewMilestoneVisible() {- return (Boolean) EditContext.get().getInputValue("moveOpenIssuesToAnotherMilestone");+ return (Boolean) EditContext.get().getInputValue("moveTodoIssuesToAnotherMilestone");}@SuppressWarnings("unused")