Skip to content

The Unified and Autonomous Development Platform

fix issue #205 - Use nearest open milestone as default when create new issue

Robin Shen3bcb17f6be9b
diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.java
index 99d4925a91..6574c493ae 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.java
@@ -41,6 +41,7 @@ import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldReso
import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValue;
import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValuesResolution;
import io.onedev.server.web.component.issue.workflowreconcile.UndefinedStateResolution;
+import io.onedev.server.web.editable.annotation.Code;
import io.onedev.server.web.editable.annotation.Editable;
@Editable
@@ -64,6 +65,8 @@ public class GlobalIssueSetting implements Serializable {
private List<IssueTemplate> issueTemplates = new ArrayList<>();
+ private String defaultMilestoneScript;
+
private boolean reconciled = true;
public GlobalIssueSetting() {
@@ -611,6 +614,15 @@ public class GlobalIssueSetting implements Serializable {
this.issueTemplates = issueTemplates;
}
+ @Code(language=Code.GROOVY)
+ public String getDefaultMilestoneScript() {
+ return defaultMilestoneScript;
+ }
+
+ public void setDefaultMilestoneScript(String defaultMilestoneScript) {
+ this.defaultMilestoneScript = defaultMilestoneScript;
+ }
+
@Nullable
public NamedIssueQuery getNamedQuery(String name) {
for (NamedIssueQuery namedQuery: getNamedQueries()) {
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.java b/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.java
index 29a243616e..df485a2b6e 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.java
@@ -2,6 +2,7 @@ package io.onedev.server.web.component.issue.create;
import java.io.Serializable;
import java.util.Collection;
+import java.util.Comparator;
import java.util.Date;
import java.util.List;
import java.util.UUID;
@@ -276,6 +277,11 @@ public abstract class NewIssueEditor extends FormComponentPanel<Issue> implement
issue.setSubmitDate(new Date());
issue.setState(getIssueSetting().getInitialStateSpec().getName());
issue.setSubmitter(SecurityUtils.getUser());
+ issue.setMilestone(getProject().getMilestones().stream()
+ .filter(it -> !it.isClosed() && it.getDueDate() != null)
+ .min(Comparator.comparing(Milestone::getDueDate))
+ .orElse(null));
+
if (getTemplate() != null)
getTemplate().fill(issue);
return issue;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
index 97fe672434..deba4a678b 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
@@ -447,8 +447,9 @@ public abstract class IssueListPanel extends Panel {
@Override
public void onClick() {
- setResponsePage(NewIssuePage.class,
- NewIssuePage.paramsOf(getProject(), queryStringModel.getObject()));
+ IssueQuery query = queryModel.getObject();
+ String template = query!=null && query.getCriteria()!=null? query.getCriteria().toString(): null;
+ setResponsePage(NewIssuePage.class, NewIssuePage.paramsOf(getProject(), template));
}
});
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueSettingPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueSettingPage.java
index 775e5e1689..32ef72dca5 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueSettingPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueSettingPage.java
@@ -51,7 +51,7 @@ public class IssueSettingPage extends AdministrationPage {
tabs.add(new PageTab(Model.of("States"), IssueStateListPage.class));
tabs.add(new PageTab(Model.of("State Transitions"), StateTransitionsPage.class));
tabs.add(new PageTab(Model.of("Default Boards"), DefaultBoardListPage.class));
- tabs.add(new PageTab(Model.of("Templates"), IssueTemplateListPage.class));
+ tabs.add(new PageTab(Model.of("Description Templates"), IssueTemplateListPage.class));
add(new Tabbable("issueSettingTabs", tabs));
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/create/NewIssuePage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/create/NewIssuePage.java
index 8545b5f364..04ee5a3d5d 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/create/NewIssuePage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/create/NewIssuePage.java
@@ -32,7 +32,7 @@ import io.onedev.server.web.page.security.LoginPage;
@SuppressWarnings("serial")
public class NewIssuePage extends ProjectPage implements InputContext, ScriptIdentityAware {
- private static final String PARAM_QUERY = "query";
+ private static final String PARAM_TEMPLATE = "query";
private IModel<IssueCriteria> templateModel;
@@ -43,7 +43,7 @@ public class NewIssuePage extends ProjectPage implements InputContext, ScriptIde
if (currentUser == null)
throw new RestartResponseAtInterceptPageException(LoginPage.class);
- String queryString = params.get(PARAM_QUERY).toString();
+ String queryString = params.get(PARAM_TEMPLATE).toString();
templateModel = new LoadableDetachableModel<IssueCriteria>() {
@Override
@@ -125,10 +125,10 @@ public class NewIssuePage extends ProjectPage implements InputContext, ScriptIde
return new SiteAdministrator();
}
- public static PageParameters paramsOf(Project project, String query) {
+ public static PageParameters paramsOf(Project project, String template) {
PageParameters params = paramsOf(project);
- if (query != null)
- params.add(PARAM_QUERY, query);
+ if (template != null)
+ params.add(PARAM_TEMPLATE, template);
return params;
}