The Unified and Autonomous Development Platform
A number of bug fixes and improvements
robin shen6a96dcbfb545
diff --git a/core/src/main/java/io/onedev/server/manager/IssueManager.java b/core/src/main/java/io/onedev/server/manager/IssueManager.javaindex 5b2c5cf552..0ef5aa9e3a 100644--- a/core/src/main/java/io/onedev/server/manager/IssueManager.java+++ b/core/src/main/java/io/onedev/server/manager/IssueManager.java@@ -8,9 +8,11 @@ import java.util.Map;import javax.annotation.Nullable;import io.onedev.server.model.Issue;+import io.onedev.server.model.Milestone;import io.onedev.server.model.Project;import io.onedev.server.model.support.issue.query.IssueCriteria;import io.onedev.server.model.support.issue.query.IssueQuery;+import io.onedev.server.model.support.issue.workflow.StateSpec;import io.onedev.server.persistence.dao.EntityManager;import io.onedev.server.web.page.project.issues.workflowreconcile.InvalidFieldResolution;import io.onedev.server.web.page.project.issues.workflowreconcile.UndefinedFieldValue;@@ -29,6 +31,8 @@ public interface IssueManager extends EntityManager<Issue> {int count(Project project, @Nullable IssueCriteria issueCriteria);List<Issue> query(Project project, @Nullable String term, int count);++ int count(Milestone milestone, @Nullable StateSpec.Category category);Collection<String> getUndefinedStates(Project project);diff --git a/core/src/main/java/io/onedev/server/manager/MilestoneManager.java b/core/src/main/java/io/onedev/server/manager/MilestoneManager.javaindex 936e24288a..9b0f9fda4f 100644--- a/core/src/main/java/io/onedev/server/manager/MilestoneManager.java+++ b/core/src/main/java/io/onedev/server/manager/MilestoneManager.java@@ -4,7 +4,6 @@ import javax.annotation.Nullable;import io.onedev.server.model.Milestone;import io.onedev.server.model.Project;-import io.onedev.server.model.support.issue.workflow.StateSpec;import io.onedev.server.persistence.dao.EntityManager;public interface MilestoneManager extends EntityManager<Milestone> {@@ -15,5 +14,4 @@ public interface MilestoneManager extends EntityManager<Milestone> {void close(Milestone milestone, @Nullable Milestone moveOpenIssuesToMilestone);- void updateIssueCount(Milestone milestone, StateSpec.Category category);-}+}\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueManager.javaindex 4137e3cf53..b68fadd0fc 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueManager.java+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueManager.java@@ -11,6 +11,7 @@ import java.util.Map;import java.util.Set;import java.util.concurrent.atomic.AtomicLong;+import javax.annotation.Nullable;import javax.inject.Inject;import javax.inject.Singleton;import javax.persistence.criteria.CriteriaBuilder;@@ -36,13 +37,17 @@ import io.onedev.server.manager.IssueQuerySettingManager;import io.onedev.server.model.Issue;import io.onedev.server.model.IssueFieldUnary;import io.onedev.server.model.IssueQuerySetting;+import io.onedev.server.model.Milestone;import io.onedev.server.model.Project;import io.onedev.server.model.support.LastActivity;import io.onedev.server.model.support.issue.NamedQuery;+import io.onedev.server.model.support.issue.query.AndCriteria;import io.onedev.server.model.support.issue.query.IssueCriteria;import io.onedev.server.model.support.issue.query.IssueQuery;+import io.onedev.server.model.support.issue.query.IssueQueryLexer;import io.onedev.server.model.support.issue.query.IssueSort;import io.onedev.server.model.support.issue.query.IssueSort.Direction;+import io.onedev.server.model.support.issue.query.MilestoneCriteria;import io.onedev.server.model.support.issue.query.QueryBuildContext;import io.onedev.server.model.support.issue.workflow.StateSpec;import io.onedev.server.persistence.annotation.Sessional;@@ -207,6 +212,24 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implementsreturn getSession().createQuery(criteriaQuery).uniqueResult().intValue();}+ @Override+ public int count(Milestone milestone, @Nullable StateSpec.Category category) {+ if (category != null) {+ IssueCriteria criteria = milestone.getProject().getIssueWorkflow().getStatesCriteria(category);+ if (criteria != null) {+ List<IssueCriteria> criterias = new ArrayList<>();+ criterias.add(new MilestoneCriteria(milestone.getName(), IssueQueryLexer.Is));+ criterias.add(criteria);+ return count(milestone.getProject(), new AndCriteria(criterias));+ } else {+ return 0;+ }+ } else {+ IssueCriteria criteria = new MilestoneCriteria(milestone.getName(), IssueQueryLexer.Is);+ return count(milestone.getProject(), criteria);+ }+ }+@SuppressWarnings("unchecked")@Sessional@Override@@ -623,4 +646,35 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implements}+ /*+ @Transactional+ @Override+ public void test() {+ Project project = OneDev.getInstance(ProjectManager.class).load(1L);+ Milestone m1 = OneDev.getInstance(MilestoneManager.class).load(1L);+ Milestone m2 = OneDev.getInstance(MilestoneManager.class).load(2L);+ User user = OneDev.getInstance(UserManager.class).load(1L);+ for (int i=1; i<=100000; i++) {+ Issue issue = new Issue();+ issue.setProject(project);+ if (i<=50000)+ issue.setMilestone(m1);+ else+ issue.setMilestone(m2);+ issue.setTitle("issue " + i);+ issue.setSubmitter(user);+ issue.setSubmitDate(new Date());+ issue.setBoardPosition(1);+ issue.setState("Open");+ LastActivity lastActivity = new LastActivity();+ lastActivity.setAction("submitted");+ lastActivity.setUser(issue.getSubmitter());+ lastActivity.setDate(issue.getSubmitDate());+ issue.setLastActivity(lastActivity);+ issue.setNumber(getNextNumber(issue.getProject()));+ issue.setLastActivity(lastActivity);+ save(issue);+ }+ }+ */}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 502a8c26a9..3fafd55f4d 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@@ -16,14 +16,13 @@ import com.google.common.base.Preconditions;import io.onedev.launcher.loader.Listen;import io.onedev.server.event.issue.IssueChanged;import io.onedev.server.event.issue.IssueOpened;-import io.onedev.server.manager.IssueManager;import io.onedev.server.manager.MilestoneManager;import io.onedev.server.model.Issue;import io.onedev.server.model.Milestone;import io.onedev.server.model.Project;+import io.onedev.server.model.support.issue.changedata.BatchChangeData;import io.onedev.server.model.support.issue.changedata.MilestoneChangeData;import io.onedev.server.model.support.issue.changedata.StateChangeData;-import io.onedev.server.model.support.issue.query.IssueCriteria;import io.onedev.server.model.support.issue.workflow.StateSpec;import io.onedev.server.persistence.annotation.Sessional;import io.onedev.server.persistence.annotation.Transactional;@@ -36,12 +35,9 @@ import io.onedev.utils.StringUtils;@Singletonpublic class DefaultMilestoneManager extends AbstractEntityManager<Milestone> implements MilestoneManager {- private final IssueManager issueManager;-@Inject- public DefaultMilestoneManager(Dao dao, IssueManager issueManager) {+ public DefaultMilestoneManager(Dao dao) {super(dao);- this.issueManager = issueManager;}@Transactional@@ -67,23 +63,6 @@ public class DefaultMilestoneManager extends AbstractEntityManager<Milestone> imsuper.delete(milestone);}- @Override- public void updateIssueCount(Milestone milestone, StateSpec.Category category) {- IssueCriteria criteria = milestone.getProject().getIssueWorkflow().getStatesCriteria(category);- if (criteria != null) {- if (category == StateSpec.Category.CLOSED)- milestone.setNumOfClosedIssues(issueManager.count(milestone.getProject(), criteria));- else- milestone.setNumOfOpenIssues(issueManager.count(milestone.getProject(), criteria));- } else {- if (category == StateSpec.Category.CLOSED)- milestone.setNumOfClosedIssues(0);- else- milestone.setNumOfOpenIssues(0);- }- save(milestone);- }-@Sessional@Overridepublic Milestone find(Project project, String name) {@@ -156,20 +135,16 @@ public class DefaultMilestoneManager extends AbstractEntityManager<Milestone> im}}}-- @Transactional- @Listen- public void on(IssueChanged event) {- Issue issue = event.getIssue();- Milestone milestone = issue.getMilestone();- if (milestone != null && event.getChange().getData() instanceof StateChangeData) {- StateChangeData data = (StateChangeData) event.getChange().getData();- StateSpec prevState = issue.getProject().getIssueWorkflow().getStateSpec(data.getOldState());- Preconditions.checkNotNull(prevState);- StateSpec state = issue.getProject().getIssueWorkflow().getStateSpec(data.getNewState());- Preconditions.checkNotNull(prevState);- if (prevState.getCategory() != state.getCategory()) {- if (prevState.getCategory() == StateSpec.Category.CLOSED) {++ private void onStateChange(Project project, @Nullable String milestoneName, String oldState, String newState) {+ Milestone milestone = project.getMilestone(milestoneName);+ if (milestone != null) {+ StateSpec oldStateSpec = project.getIssueWorkflow().getStateSpec(oldState);+ Preconditions.checkNotNull(oldStateSpec);+ StateSpec newStateSpec = project.getIssueWorkflow().getStateSpec(newState);+ Preconditions.checkNotNull(oldStateSpec);+ if (oldStateSpec.getCategory() != newStateSpec.getCategory()) {+ if (oldStateSpec.getCategory() == StateSpec.Category.CLOSED) {milestone.setNumOfClosedIssues(milestone.getNumOfClosedIssues()-1);milestone.setNumOfOpenIssues(milestone.getNumOfOpenIssues()+1);} else {@@ -178,27 +153,46 @@ public class DefaultMilestoneManager extends AbstractEntityManager<Milestone> im}save(milestone);}- } else if (event.getChange().getData() instanceof MilestoneChangeData) {- MilestoneChangeData data = (MilestoneChangeData) event.getChange().getData();- Milestone oldMilestone = issue.getProject().getMilestone(data.getOldMilestone());- Milestone newMilestone = issue.getProject().getMilestone(data.getNewMilestone());- StateSpec state = issue.getProject().getIssueWorkflow().getStateSpec(issue.getState());- Preconditions.checkNotNull(state);- if (state.getCategory() == StateSpec.Category.CLOSED) {- if (oldMilestone != null)- oldMilestone.setNumOfClosedIssues(oldMilestone.getNumOfClosedIssues()-1);- if (newMilestone != null)- newMilestone.setNumOfClosedIssues(newMilestone.getNumOfClosedIssues()+1);- } else {- if (oldMilestone != null)- oldMilestone.setNumOfOpenIssues(oldMilestone.getNumOfOpenIssues()-1);- if (newMilestone != null)- newMilestone.setNumOfOpenIssues(newMilestone.getNumOfOpenIssues()+1);- }+ }+ }++ private void onMilestoneChange(Project project, String state, @Nullable String oldMilestoneName, @Nullable String newMilestoneName) {+ Milestone oldMilestone = project.getMilestone(oldMilestoneName);+ Milestone newMilestone = project.getMilestone(newMilestoneName);+ StateSpec stateSpec = project.getIssueWorkflow().getStateSpec(state);+ Preconditions.checkNotNull(stateSpec);+ if (stateSpec.getCategory() == StateSpec.Category.CLOSED) {+ if (oldMilestone != null)+ oldMilestone.setNumOfClosedIssues(oldMilestone.getNumOfClosedIssues()-1);+ if (newMilestone != null)+ newMilestone.setNumOfClosedIssues(newMilestone.getNumOfClosedIssues()+1);+ } else {if (oldMilestone != null)- save(oldMilestone);+ oldMilestone.setNumOfOpenIssues(oldMilestone.getNumOfOpenIssues()-1);if (newMilestone != null)- save(newMilestone);+ newMilestone.setNumOfOpenIssues(newMilestone.getNumOfOpenIssues()+1);}+ if (oldMilestone != null)+ save(oldMilestone);+ if (newMilestone != null)+ save(newMilestone);}++ @Transactional+ @Listen+ public void on(IssueChanged event) {+ Project project = event.getIssue().getProject();+ if (event.getChange().getData() instanceof BatchChangeData) {+ BatchChangeData data = (BatchChangeData) event.getChange().getData();+ onStateChange(project, data.getOldMilestone(), data.getOldState(), data.getNewState());+ onMilestoneChange(project, data.getNewState(), data.getOldMilestone(), data.getNewMilestone());+ } else if (event.getChange().getData() instanceof StateChangeData) {+ StateChangeData data = (StateChangeData) event.getChange().getData();+ onStateChange(project, event.getIssue().getMilestoneName(), data.getOldState(), data.getNewState());+ } else if (event.getChange().getData() instanceof MilestoneChangeData) {+ MilestoneChangeData data = (MilestoneChangeData) event.getChange().getData();+ onMilestoneChange(project, event.getIssue().getState(), data.getOldMilestone(), data.getNewMilestone());+ }+ }+}diff --git a/core/src/main/java/io/onedev/server/model/Issue.java b/core/src/main/java/io/onedev/server/model/Issue.javaindex d443ae61ac..a515b9fbe1 100644--- a/core/src/main/java/io/onedev/server/model/Issue.java+++ b/core/src/main/java/io/onedev/server/model/Issue.java@@ -50,7 +50,8 @@ import io.onedev.server.web.editable.annotation.Editable;@Index(columnList="title"), @Index(columnList="noSpaceTitle"),@Index(columnList="number"), @Index(columnList="numberStr"),@Index(columnList="submitDate"), @Index(columnList="g_submitter_id"),- @Index(columnList="numOfVotes"), @Index(columnList="numOfComments")})+ @Index(columnList="numOfVotes"), @Index(columnList="numOfComments"),+ @Index(columnList="g_milestone_id"), @Index(columnList="LAST_ACT_DATE")})@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)@Editablepublic class Issue extends AbstractEntity implements Referenceable {diff --git a/core/src/main/java/io/onedev/server/model/support/issue/FieldsEditBean.java b/core/src/main/java/io/onedev/server/web/component/issuelist/FieldsEditBean.javasimilarity index 89%rename from core/src/main/java/io/onedev/server/model/support/issue/FieldsEditBean.javarename to core/src/main/java/io/onedev/server/web/component/issuelist/FieldsEditBean.javaindex fc0b29891e..2164f82abd 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/FieldsEditBean.java+++ b/core/src/main/java/io/onedev/server/web/component/issuelist/FieldsEditBean.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.issue;+package io.onedev.server.web.component.issuelist;import java.io.Serializable;import java.util.ArrayList;@@ -18,7 +18,7 @@ public class FieldsEditBean implements Serializable {private List<String> fields = new ArrayList<>();- @Editable+ @Editable(description="<b>Hint:</b> Selected fields can be dragged and reordered")@ChoiceProvider("getFieldChoices")public List<String> getFields() {return fields;diff --git a/core/src/main/java/io/onedev/server/web/component/issuelist/IssueListPanel.java b/core/src/main/java/io/onedev/server/web/component/issuelist/IssueListPanel.javaindex 5b580c53f2..9c122d20da 100644--- a/core/src/main/java/io/onedev/server/web/component/issuelist/IssueListPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/issuelist/IssueListPanel.java@@ -47,7 +47,6 @@ import io.onedev.server.manager.ProjectManager;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;import io.onedev.server.model.User;-import io.onedev.server.model.support.issue.FieldsEditBean;import io.onedev.server.model.support.issue.IssueField;import io.onedev.server.model.support.issue.query.AndCriteria;import io.onedev.server.model.support.issue.query.IssueCriteria;@@ -163,7 +162,7 @@ public abstract class IssueListPanel extends GenericPanel<String> {@Overrideprotected void onUpdate(AjaxRequestTarget target) {- if (SecurityUtils.getUser() != null)+ if (SecurityUtils.getUser() != null && getQuerySaveSupport() != null)target.add(querySave);}diff --git a/core/src/main/java/io/onedev/server/web/component/select2/DragSortResourceReference.java b/core/src/main/java/io/onedev/server/web/component/select2/DragSortResourceReference.javanew file mode 100644index 0000000000..5ec4554960--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/component/select2/DragSortResourceReference.java@@ -0,0 +1,26 @@+package io.onedev.server.web.component.select2;++import java.util.List;++import org.apache.wicket.markup.head.HeaderItem;+import org.apache.wicket.markup.head.JavaScriptHeaderItem;+import org.apache.wicket.request.resource.JavaScriptResourceReference;++import io.onedev.server.web.asset.jqueryui.JQueryUIResourceReference;++public class DragSortResourceReference extends JavaScriptResourceReference {++ private static final long serialVersionUID = 1L;++ public DragSortResourceReference() {+ super(DragSortResourceReference.class, "res/drag-sort.js");+ }++ @Override+ public List<HeaderItem> getDependencies() {+ List<HeaderItem> dependencies = super.getDependencies();+ dependencies.add(JavaScriptHeaderItem.forReference(new JQueryUIResourceReference()));+ return dependencies;+ }++}diff --git a/core/src/main/java/io/onedev/server/web/component/select2/Select2MultiChoice.java b/core/src/main/java/io/onedev/server/web/component/select2/Select2MultiChoice.javaindex bd4749b9b1..06df0d7638 100644--- a/core/src/main/java/io/onedev/server/web/component/select2/Select2MultiChoice.java+++ b/core/src/main/java/io/onedev/server/web/component/select2/Select2MultiChoice.java@@ -17,6 +17,7 @@ import java.util.Arrays;import java.util.Collection;import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.head.JavaScriptHeaderItem;import org.apache.wicket.markup.head.OnLoadHeaderItem;import org.apache.wicket.model.IModel;import org.apache.wicket.util.string.Strings;@@ -103,6 +104,7 @@ public class Select2MultiChoice<T> extends AbstractSelect2Choice<T, Collection<T@Overrideprotected void renderInitializationScript(IHeaderResponse response) {+ response.render(JavaScriptHeaderItem.forReference(new DragSortResourceReference()));Collection<? extends T> choices;if (getWebRequest().getRequestParameters().getParameterNames().contains(getInputName())) {convertInput();@@ -130,6 +132,8 @@ public class Select2MultiChoice<T> extends AbstractSelect2Choice<T, Collection<Tresponse.render(OnLoadHeaderItem.forScript(JQuery.execute("$('#%s').select2('data', %s);", getJquerySafeMarkupId(), selection.toJson())));}+ String script = String.format("onedev.server.select2DragSort.onWindowLoad('%s');", getMarkupId());+ response.render(OnLoadHeaderItem.forScript(script));}}diff --git a/core/src/main/java/io/onedev/server/web/component/select2/res/drag-sort.js b/core/src/main/java/io/onedev/server/web/component/select2/res/drag-sort.jsnew file mode 100644index 0000000000..5a69a9bb3f--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/component/select2/res/drag-sort.js@@ -0,0 +1,14 @@+onedev.server.select2DragSort = {+ onWindowLoad: function(containerId) {+ var $container = $("#" + containerId);+ $container.select2("container").find("ul.select2-choices").sortable({+ containment: 'parent',+ start: function() {+ $container.select2("onSortStart");+ },+ update: function() {+ $container.select2("onSortEnd");+ }+ });+ }+}\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/editable/property-container.js b/core/src/main/java/io/onedev/server/web/editable/property-container.jsindex f23963ba50..704aceb259 100644--- a/core/src/main/java/io/onedev/server/web/editable/property-container.js+++ b/core/src/main/java/io/onedev/server/web/editable/property-container.js@@ -1,12 +1,14 @@onedev.server.propertyContainer = {onDomReady: function(containerId) {var $container = $("#" + containerId);- var input = $container.find(".value>input[type=checkbox]");- input.parent().prev("label.name").addClass("pull-left");- input.after("<div style='clear:both;'/>")+ var $input = $container.find(".value>input[type=checkbox]");+ $input.css("margin-right", "8px");+ $input.css("vertical-align", "text-top");+ $input.parent().prev("label.name").insertAfter($input);- input = $container.find(".value>div>input[type=checkbox]");- input.parent().parent().prev("label.name").addClass("pull-left");- input.after("<div style='clear:both;'/>")+ $input = $container.find(".value>div>input[type=checkbox]");+ $input.css("margin-right", "8px");+ $input.css("vertical-align", "text-top");+ $input.parent().parent().prev("label.name").insertAfter($input);}}\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.javaindex e5ad838dd6..a2408e1885 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.java@@ -613,7 +613,7 @@ public abstract class IssueDetailPage extends ProjectPage implements InputContexreturn item.getModelObject();}- });+ }.setRenderBodyOnly(true));}});diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/issue-detail.css b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/issue-detail.cssindex 421f175b0c..1a751e537b 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/issue-detail.css+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/issue-detail.css@@ -90,17 +90,15 @@}#issue-detail>.side .fields td {- padding-bottom: 10px;- vertical-align: middle;+ padding-bottom: 12px;vertical-align: top;}#issue-detail>.side .fields tr:last-child td {padding-bottom: 0;}-#issue-detail>.side .fields .name {- line-height: 20px;+#issue-detail>.side .fields td.name {white-space: nowrap;- padding: 3px 20px 3px 0;+ padding-right: 20px;}#issue-detail>.side .fields .value.has-color {display: table-cell;diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/ActionPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/ActionPanel.javadeleted file mode 100644index 1e452da960..0000000000--- a/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/ActionPanel.java+++ /dev/null@@ -1,209 +0,0 @@-package io.onedev.server.web.page.project.issues.milestones;--import org.apache.wicket.Component;-import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.ajax.markup.html.AjaxLink;-import org.apache.wicket.ajax.markup.html.form.AjaxButton;-import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.form.Form;-import org.apache.wicket.markup.html.link.BookmarkablePageLink;-import org.apache.wicket.markup.html.panel.Fragment;-import org.apache.wicket.markup.html.panel.GenericPanel;-import org.apache.wicket.model.IModel;--import com.google.common.base.Preconditions;-import com.google.common.collect.Sets;--import io.onedev.server.OneDev;-import io.onedev.server.manager.MilestoneManager;-import io.onedev.server.model.Milestone;-import io.onedev.server.web.component.modal.ModalPanel;-import io.onedev.server.web.editable.BeanContext;--@SuppressWarnings("serial")-abstract class ActionPanel extends GenericPanel<Milestone> {-- public ActionPanel(String id, IModel<Milestone> model) {- super(id, model);- }-- private Milestone getMilestone() {- return getModelObject();- }-- @Override- protected void onInitialize() {- super.onInitialize();-- add(new AjaxLink<Void>("reopen") {-- @Override- public void onClick(AjaxRequestTarget target) {- Milestone milestone = getMilestone();- milestone.setClosed(false);- OneDev.getInstance(MilestoneManager.class).save(milestone);- target.add(ActionPanel.this);- onUpdated(target);- }-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(getMilestone().isClosed());- }-- });-- add(new AjaxLink<Void>("close") {-- @Override- public void onClick(AjaxRequestTarget target) {- new ModalPanel(target) {-- @Override- protected Component newContent(String id) {- Fragment fragment = new Fragment(id, "confirmCloseFrag", ActionPanel.this);- Form<?> form = new Form<Void>("form");- form.setOutputMarkupId(true);-- form.add(new Label("title", "Confirm Closing Milestone '" + getMilestone().getName() + "'"));-- MilestoneCloseOption option = new MilestoneCloseOption();- option.setMilestoneToClose(getMilestone().getName());- form.add(BeanContext.editBean("editor", option, Sets.newHashSet("milestoneToClose")));-- form.add(new AjaxLink<Void>("close") {-- @Override- public void onClick(AjaxRequestTarget target) {- close();- }-- });- form.add(new AjaxLink<Void>("cancel") {-- @Override- public void onClick(AjaxRequestTarget target) {- close();- }-- });- form.add(new AjaxButton("ok") {-- @Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);- MilestoneManager milestoneManager = OneDev.getInstance(MilestoneManager.class);- if (option.isMoveOpenIssuesToAnotherMilestone()) {- Milestone newMilestone = milestoneManager.find(getMilestone().getProject(), option.getNewMilestone());- Preconditions.checkNotNull(newMilestone);- milestoneManager.close(getMilestone(), newMilestone);- } else {- milestoneManager.close(getMilestone(), null);- }- target.add(ActionPanel.this);- close();- onUpdated(target);- }-- @Override- protected void onError(AjaxRequestTarget target, Form<?> form) {- super.onError(target, form);- target.add(form);- }-- });- fragment.add(form);-- return fragment;- }-- };- }-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(!getMilestone().isClosed());- }-- });-- add(new BookmarkablePageLink<Void>("edit", MilestoneEditPage.class,- MilestoneEditPage.paramsOf(getMilestone())));-- add(new AjaxLink<Void>("delete") {-- @Override- public void onClick(AjaxRequestTarget target) {- new ModalPanel(target) {-- @Override- protected Component newContent(String id) {- Fragment fragment = new Fragment(id, "confirmDeleteFrag", ActionPanel.this);- Form<?> form = new Form<Void>("form");- form.setOutputMarkupId(true);-- form.add(new Label("title", "Confirm Deleting Milestone '" + getMilestone().getName() + "'"));-- MilestoneDeleteOption option = new MilestoneDeleteOption();- option.setMilestoneToDelete(getMilestone().getName());- form.add(BeanContext.editBean("editor", option, Sets.newHashSet("milestoneToDelete")));-- form.add(new AjaxLink<Void>("close") {-- @Override- public void onClick(AjaxRequestTarget target) {- close();- }-- });- form.add(new AjaxLink<Void>("cancel") {-- @Override- public void onClick(AjaxRequestTarget target) {- close();- }-- });- form.add(new AjaxButton("ok") {-- @Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);- MilestoneManager milestoneManager = OneDev.getInstance(MilestoneManager.class);- if (option.isMoveIssuesToAnotherMilestone()) {- Milestone newMilestone = milestoneManager.find(getMilestone().getProject(), option.getNewMilestone());- Preconditions.checkNotNull(newMilestone);- milestoneManager.delete(getMilestone(), newMilestone);- } else {- milestoneManager.delete(getMilestone(), null);- }- target.add(ActionPanel.this);- close();- onDeleted(target);- }-- @Override- protected void onError(AjaxRequestTarget target, Form<?> form) {- super.onError(target, form);- target.add(form);- }-- });- fragment.add(form);-- return fragment;- }- };- }-- });- setOutputMarkupId(true);- }-- protected abstract void onDeleted(AjaxRequestTarget target);-- protected abstract void onUpdated(AjaxRequestTarget target);--}diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/ActionPanel.html b/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneActionsPanel.htmlsimilarity index 64%rename from core/src/main/java/io/onedev/server/web/page/project/issues/milestones/ActionPanel.htmlrename to core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneActionsPanel.htmlindex 80ebadb4b0..f8ee095e94 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/ActionPanel.html+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneActionsPanel.html@@ -5,7 +5,7 @@<a wicket:id="edit" title="Edit milestone"><i class="fa fa-pencil"></i> edit</a><a wicket:id="delete" title="Delete milestone"><i class="fa fa-trash"></i> delete</a></div>- <wicket:fragment wicket:id="confirmCloseFrag">+ <wicket:fragment wicket:id="confirmCloseWithOpenIssuesFrag"><form wicket:id="form" class="confirm-close-milestone no-autofocus"><div class="modal-header"><button wicket:id="close" type="button" class="close">×</button>@@ -22,7 +22,16 @@</div></form></wicket:fragment>- <wicket:fragment wicket:id="confirmDeleteFrag">+ <wicket:fragment wicket:id="confirmCloseWithoutOpenIssuesFrag">+ <div class="modal-body">+ <h4>Do you really want to close milestone "<span wicket:id="milestone"></span>"?</h4>+ </div>+ <div class="modal-footer clearfix">+ <a wicket:id="ok" class="btn btn-primary">Ok</a>+ <a wicket:id="cancel" class="btn btn-default">Cancel</a>+ </div>+ </wicket:fragment>+ <wicket:fragment wicket:id="confirmDeleteWithIssuesFrag"><form wicket:id="form" class="confirm-delete-milestone no-autofocus"><div class="modal-header"><button wicket:id="close" type="button" class="close">×</button>@@ -39,4 +48,13 @@</div></form></wicket:fragment>+ <wicket:fragment wicket:id="confirmDeleteWithoutIssuesFrag">+ <div class="modal-body">+ <h4>Do you really want to delete milestone "<span wicket:id="milestone"></span>"?</h4>+ </div>+ <div class="modal-footer clearfix">+ <a wicket:id="ok" class="btn btn-primary">Ok</a>+ <a wicket:id="cancel" class="btn btn-default">Cancel</a>+ </div>+ </wicket:fragment></wicket:panel>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneActionsPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneActionsPanel.javanew file mode 100644index 0000000000..d87282b91a--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneActionsPanel.java@@ -0,0 +1,261 @@+package io.onedev.server.web.page.project.issues.milestones;++import org.apache.wicket.Component;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.markup.html.AjaxLink;+import org.apache.wicket.ajax.markup.html.form.AjaxButton;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.form.Form;+import org.apache.wicket.markup.html.link.BookmarkablePageLink;+import org.apache.wicket.markup.html.panel.Fragment;+import org.apache.wicket.markup.html.panel.GenericPanel;+import org.apache.wicket.model.IModel;++import com.google.common.base.Preconditions;+import com.google.common.collect.Sets;++import io.onedev.server.OneDev;+import io.onedev.server.manager.IssueManager;+import io.onedev.server.manager.MilestoneManager;+import io.onedev.server.model.Milestone;+import io.onedev.server.model.support.issue.workflow.StateSpec;+import io.onedev.server.web.component.modal.ModalPanel;+import io.onedev.server.web.editable.BeanContext;++@SuppressWarnings("serial")+abstract class MilestoneActionsPanel extends GenericPanel<Milestone> {++ public MilestoneActionsPanel(String id, IModel<Milestone> model) {+ super(id, model);+ }++ private Milestone getMilestone() {+ return getModelObject();+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ add(new AjaxLink<Void>("reopen") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ Milestone milestone = getMilestone();+ milestone.setClosed(false);+ OneDev.getInstance(MilestoneManager.class).save(milestone);+ target.add(MilestoneActionsPanel.this);+ onUpdated(target);+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(getMilestone().isClosed());+ }++ });++ add(new AjaxLink<Void>("close") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ new ModalPanel(target) {++ @Override+ protected Component newContent(String id) {+ if (OneDev.getInstance(IssueManager.class).count(getMilestone(), StateSpec.Category.OPEN) != 0) {+ Fragment fragment = new Fragment(id, "confirmCloseWithOpenIssuesFrag", MilestoneActionsPanel.this);+ Form<?> form = new Form<Void>("form");+ form.setOutputMarkupId(true);++ form.add(new Label("title", "Confirm Closing Milestone '" + getMilestone().getName() + "'"));++ MilestoneCloseOption option = new MilestoneCloseOption();+ option.setMilestoneToClose(getMilestone().getName());+ form.add(BeanContext.editBean("editor", option, Sets.newHashSet("milestoneToClose")));++ form.add(new AjaxLink<Void>("close") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ close();+ }++ });+ form.add(new AjaxLink<Void>("cancel") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ close();+ }++ });+ form.add(new AjaxButton("ok") {++ @Override+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {+ super.onSubmit(target, form);+ MilestoneManager milestoneManager = OneDev.getInstance(MilestoneManager.class);+ if (option.isMoveOpenIssuesToAnotherMilestone()) {+ Milestone newMilestone = milestoneManager.find(getMilestone().getProject(), option.getNewMilestone());+ Preconditions.checkNotNull(newMilestone);+ milestoneManager.close(getMilestone(), newMilestone);+ } else {+ milestoneManager.close(getMilestone(), null);+ }+ target.add(MilestoneActionsPanel.this);+ close();+ onUpdated(target);+ }++ @Override+ protected void onError(AjaxRequestTarget target, Form<?> form) {+ super.onError(target, form);+ target.add(form);+ }++ });+ fragment.add(form);++ return fragment;+ } else {+ Fragment fragment = new Fragment(id, "confirmCloseWithoutOpenIssuesFrag", MilestoneActionsPanel.this);+ fragment.add(new Label("milestone", getMilestone().getName()));+ fragment.add(new AjaxLink<Void>("ok") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ OneDev.getInstance(MilestoneManager.class).close(getMilestone(), null);+ target.add(MilestoneActionsPanel.this);+ close();+ onUpdated(target);+ }++ });+ fragment.add(new AjaxLink<Void>("cancel") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ close();+ }++ });+ return fragment;+ }+ }++ };+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(!getMilestone().isClosed());+ }++ });++ add(new BookmarkablePageLink<Void>("edit", MilestoneEditPage.class,+ MilestoneEditPage.paramsOf(getMilestone())));++ add(new AjaxLink<Void>("delete") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ new ModalPanel(target) {++ @Override+ protected Component newContent(String id) {+ if (OneDev.getInstance(IssueManager.class).count(getMilestone(), null) != 0) {+ Fragment fragment = new Fragment(id, "confirmDeleteWithIssuesFrag", MilestoneActionsPanel.this);+ Form<?> form = new Form<Void>("form");+ form.setOutputMarkupId(true);++ form.add(new Label("title", "Confirm Deleting Milestone '" + getMilestone().getName() + "'"));++ MilestoneDeleteOption option = new MilestoneDeleteOption();+ option.setMilestoneToDelete(getMilestone().getName());+ form.add(BeanContext.editBean("editor", option, Sets.newHashSet("milestoneToDelete")));++ form.add(new AjaxLink<Void>("close") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ close();+ }++ });+ form.add(new AjaxLink<Void>("cancel") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ close();+ }++ });+ form.add(new AjaxButton("ok") {++ @Override+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {+ super.onSubmit(target, form);+ MilestoneManager milestoneManager = OneDev.getInstance(MilestoneManager.class);+ if (option.isMoveIssuesToAnotherMilestone()) {+ Milestone newMilestone = milestoneManager.find(getMilestone().getProject(), option.getNewMilestone());+ Preconditions.checkNotNull(newMilestone);+ milestoneManager.delete(getMilestone(), newMilestone);+ } else {+ milestoneManager.delete(getMilestone(), null);+ }+ target.add(MilestoneActionsPanel.this);+ close();+ onDeleted(target);+ }++ @Override+ protected void onError(AjaxRequestTarget target, Form<?> form) {+ super.onError(target, form);+ target.add(form);+ }++ });+ fragment.add(form);++ return fragment;+ } else {+ Fragment fragment = new Fragment(id, "confirmDeleteWithoutIssuesFrag", MilestoneActionsPanel.this);+ fragment.add(new Label("milestone", getMilestone().getName()));+ fragment.add(new AjaxLink<Void>("ok") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ OneDev.getInstance(MilestoneManager.class).delete(getMilestone(), null);+ target.add(MilestoneActionsPanel.this);+ close();+ onDeleted(target);+ }++ });+ fragment.add(new AjaxLink<Void>("cancel") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ close();+ }++ });+ return fragment;+ }+ }+ };+ }++ });+ setOutputMarkupId(true);+ }++ protected abstract void onDeleted(AjaxRequestTarget target);++ protected abstract void onUpdated(AjaxRequestTarget target);++}diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneDetailPage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneDetailPage.javaindex d84f8db7b0..a08348daa4 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@@ -100,7 +100,7 @@ public class MilestoneDetailPage extends IssuesPage {});- add(new ActionPanel("actions", milestoneModel) {+ add(new MilestoneActionsPanel("actions", milestoneModel) {@Overrideprotected void onDeleted(AjaxRequestTarget target) {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 298739cbec..f1c56eb15e 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@@ -194,7 +194,7 @@ public class MilestoneListPage extends IssuesPage {@Overridepublic void populateItem(Item<ICellPopulator<Milestone>> cellItem, String componentId,IModel<Milestone> rowModel) {- cellItem.add(new ActionPanel(componentId, rowModel) {+ cellItem.add(new MilestoneActionsPanel(componentId, rowModel) {@Overrideprotected void onUpdated(AjaxRequestTarget target) {