The Unified and Autonomous Development Platform
Fix issue #556 - Custom issue field of type "milestone"
Robin Shenfd0f9ace07c1
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/MilestoneChoiceParam.java b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/MilestoneChoiceParam.javanew file mode 100644index 0000000000..5e2f849941--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/MilestoneChoiceParam.java@@ -0,0 +1,37 @@+package io.onedev.server.buildspec.param.spec;++import java.util.List;+import java.util.Map;++import io.onedev.server.model.support.inputspec.MilestoneChoiceInput;+import io.onedev.server.web.editable.annotation.Editable;++@Editable(order=1110, name=ParamSpec.MILESTONE)+public class MilestoneChoiceParam extends ParamSpec {++ private static final long serialVersionUID = 1L;++ @Override+ public String getPropertyDef(Map<String, Integer> indexes) {+ return MilestoneChoiceInput.getPropertyDef(this, indexes);+ }++ @Override+ public Object convertToObject(List<String> strings) {+ return MilestoneChoiceInput.convertToObject(this, strings);+ }++ @Override+ public List<String> convertToStrings(Object value) {+ return MilestoneChoiceInput.convertToStrings(this, value);+ }++ @Override+ public long getOrdinal(String fieldValue) {+ if (fieldValue != null)+ return MilestoneChoiceInput.getOrdinal(fieldValue);+ else+ return super.getOrdinal(fieldValue);+ }++}diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/InputSpec.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/InputSpec.javaindex 8f1ad4319b..a7d2349429 100644--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/InputSpec.java+++ b/server-core/src/main/java/io/onedev/server/model/support/inputspec/InputSpec.java@@ -53,6 +53,8 @@ public abstract class InputSpec implements Serializable {public static final String ISSUE = "Issue";+ public static final String MILESTONE = "Milestone";+public static final String BUILD = "Build";public static final String PULL_REQUEST = "Pull Request";diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/MilestoneChoiceInput.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/MilestoneChoiceInput.javanew file mode 100644index 0000000000..8c9c7137a4--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/model/support/inputspec/MilestoneChoiceInput.java@@ -0,0 +1,76 @@+package io.onedev.server.model.support.inputspec;++import java.util.ArrayList;+import java.util.List;+import java.util.Map;++import javax.validation.ValidationException;++import edu.emory.mathcs.backport.java.util.Collections;+import io.onedev.server.model.Milestone;+import io.onedev.server.model.Project;++public class MilestoneChoiceInput {++ public static String getPropertyDef(InputSpec inputSpec, Map<String, Integer> indexes) {+ int index = indexes.get(inputSpec.getName());+ StringBuffer buffer = new StringBuffer();+ inputSpec.appendField(buffer, index, inputSpec.isAllowMultiple()? "List<String>": "String");+ inputSpec.appendCommonAnnotations(buffer, index);+ if (!inputSpec.isAllowEmpty()) {+ if (inputSpec.isAllowMultiple())+ buffer.append(" @Size(min=1, message=\"At least one milestone needs to be selected\")\n");+ else+ buffer.append(" @NotEmpty\n");+ }++ buffer.append(" @MilestoneChoice\n");++ if (inputSpec.isAllowMultiple())+ inputSpec.appendMethods(buffer, index, "List<String>", null, null);+ else+ inputSpec.appendMethods(buffer, index, "String", null, null);++ return buffer.toString();+ }++ public static Object convertToObject(InputSpec inputSpec, List<String> strings) {+ if (inputSpec.isAllowMultiple())+ return strings;+ else if (strings.size() == 0)+ return null;+ else if (strings.size() == 1)+ return strings.iterator().next();+ else+ throw new ValidationException("Not eligible for multi-value");+ }++ @SuppressWarnings("unchecked")+ public static List<String> convertToStrings(InputSpec inputSpec, Object value) {+ List<String> strings = new ArrayList<>();+ if (inputSpec.isAllowMultiple()) {+ if (inputSpec.checkListElements(value, String.class))+ strings.addAll((List<String>) value);+ Collections.sort(strings);+ } else if (value instanceof String) {+ strings.add((String) value);+ }+ return strings;+ }++ public static int getOrdinal(String fieldValue) {+ int ordinal = -1;+ Project project = Project.get();+ if (project != null) {+ List<Milestone> milestones = new ArrayList<>(project.getHierarchyMilestones());+ Collections.sort(milestones);+ for (Milestone milestone: milestones) {+ ordinal++;+ if (milestone.getName().equals(fieldValue))+ break;+ }+ }+ return ordinal;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/MilestoneChoiceField.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/MilestoneChoiceField.javanew file mode 100644index 0000000000..5a22bdcf81--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/MilestoneChoiceField.java@@ -0,0 +1,41 @@+package io.onedev.server.model.support.issue.field.spec;++import java.util.List;+import java.util.Map;++import io.onedev.server.model.support.inputspec.MilestoneChoiceInput;+import io.onedev.server.web.editable.annotation.Editable;++@Editable(order=1110, name=FieldSpec.MILESTONE)+public class MilestoneChoiceField extends FieldSpec {++ private static final long serialVersionUID = 1L;++ @Override+ public String getPropertyDef(Map<String, Integer> indexes) {+ return MilestoneChoiceInput.getPropertyDef(this, indexes);+ }++ @Override+ public Object convertToObject(List<String> strings) {+ return MilestoneChoiceInput.convertToObject(this, strings);+ }++ @Override+ public List<String> convertToStrings(Object value) {+ return MilestoneChoiceInput.convertToStrings(this, value);+ }++ @Override+ public long getOrdinal(String fieldValue) {+ if (fieldValue != null)+ return MilestoneChoiceInput.getOrdinal(fieldValue);+ else+ return super.getOrdinal(fieldValue);+ }++ @Override+ protected void runScripts() {+ }++}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.javaindex 0eaf5a1e58..86e9ae9aaa 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java@@ -36,6 +36,7 @@ import io.onedev.server.model.support.issue.field.spec.FieldSpec;import io.onedev.server.model.support.issue.field.spec.GroupChoiceField;import io.onedev.server.model.support.issue.field.spec.IntegerField;import io.onedev.server.model.support.issue.field.spec.IssueChoiceField;+import io.onedev.server.model.support.issue.field.spec.MilestoneChoiceField;import io.onedev.server.model.support.issue.field.spec.PullRequestChoiceField;import io.onedev.server.model.support.issue.field.spec.TextField;import io.onedev.server.model.support.issue.field.spec.UserChoiceField;@@ -339,7 +340,7 @@ public class IssueQuery extends EntityQuery<Issue> implements Comparator<Issue>if (validate && !Issue.ORDER_FIELDS.containsKey(fieldName)) {FieldSpec fieldSpec = getGlobalIssueSetting().getFieldSpec(fieldName);if (validate && !(fieldSpec instanceof ChoiceField) && !(fieldSpec instanceof DateField)- && !(fieldSpec instanceof IntegerField)) {+ && !(fieldSpec instanceof IntegerField) && !(fieldSpec instanceof MilestoneChoiceField)) {throw new ExplicitException("Can not order by field: " + fieldName);}}diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.javaindex 96f0fb9ffa..d5b02eacb5 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java@@ -64,6 +64,7 @@ import io.onedev.server.model.support.issue.field.spec.FieldSpec;import io.onedev.server.model.support.issue.field.spec.GroupChoiceField;import io.onedev.server.model.support.issue.field.spec.IntegerField;import io.onedev.server.model.support.issue.field.spec.IssueChoiceField;+import io.onedev.server.model.support.issue.field.spec.MilestoneChoiceField;import io.onedev.server.model.support.issue.field.spec.PullRequestChoiceField;import io.onedev.server.model.support.issue.field.spec.TextField;import io.onedev.server.model.support.issue.field.spec.UserChoiceField;@@ -126,8 +127,10 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {if (getProject() != null)candidates.remove(Issue.NAME_PROJECT);for (FieldSpec field: issueSetting.getFieldSpecs()) {- if (field instanceof IntegerField || field instanceof ChoiceField || field instanceof DateField)+ if (field instanceof IntegerField || field instanceof ChoiceField+ || field instanceof DateField || field instanceof MilestoneChoiceField) {candidates.add(field.getName());+ }}return SuggestionUtils.suggest(candidates, matchWith);} else if ("revisionValue".equals(spec.getLabel())) {diff --git a/server-core/src/main/java/io/onedev/server/web/component/branch/choice/BranchSingleChoice.java b/server-core/src/main/java/io/onedev/server/web/component/branch/choice/BranchSingleChoice.javaindex 74794346c3..1412d4e74e 100644--- a/server-core/src/main/java/io/onedev/server/web/component/branch/choice/BranchSingleChoice.java+++ b/server-core/src/main/java/io/onedev/server/web/component/branch/choice/BranchSingleChoice.java@@ -21,6 +21,7 @@ public class BranchSingleChoice extends Select2Choice<String> {protected void onInitialize() {super.onInitialize();+ getSettings().setAllowClear(!isRequired());if (isRequired())getSettings().setPlaceholder("Choose branch...");else@@ -31,12 +32,6 @@ public class BranchSingleChoice extends Select2Choice<String> {setConvertEmptyInputStringToNull(true);}- @Override- protected void onBeforeRender() {- getSettings().setAllowClear(!isRequired());- super.onBeforeRender();- }-@Overridepublic void renderHead(IHeaderResponse response) {super.renderHead(response);diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/choice/BuildSingleChoice.java b/server-core/src/main/java/io/onedev/server/web/component/build/choice/BuildSingleChoice.javaindex 86edb6bf06..51154bd1dc 100644--- a/server-core/src/main/java/io/onedev/server/web/component/build/choice/BuildSingleChoice.java+++ b/server-core/src/main/java/io/onedev/server/web/component/build/choice/BuildSingleChoice.java@@ -17,6 +17,8 @@ public class BuildSingleChoice extends Select2Choice<Build> {@Overrideprotected void onInitialize() {super.onInitialize();++ getSettings().setAllowClear(!isRequired());if (isRequired())getSettings().setPlaceholder("Choose build...");else@@ -27,12 +29,6 @@ public class BuildSingleChoice extends Select2Choice<Build> {setConvertEmptyInputStringToNull(true);}- @Override- protected void onBeforeRender() {- getSettings().setAllowClear(!isRequired());- super.onBeforeRender();- }-@Overridepublic void renderHead(IHeaderResponse response) {super.renderHead(response);diff --git a/server-core/src/main/java/io/onedev/server/web/component/groupchoice/GroupSingleChoice.java b/server-core/src/main/java/io/onedev/server/web/component/groupchoice/GroupSingleChoice.javaindex 46963e2d3b..1ef1cd786b 100644--- a/server-core/src/main/java/io/onedev/server/web/component/groupchoice/GroupSingleChoice.java+++ b/server-core/src/main/java/io/onedev/server/web/component/groupchoice/GroupSingleChoice.java@@ -19,6 +19,8 @@ public class GroupSingleChoice extends Select2Choice<Group> {@Overrideprotected void onInitialize() {super.onInitialize();++ getSettings().setAllowClear(!isRequired());if (isRequired())getSettings().setPlaceholder("Choose group...");else@@ -28,12 +30,6 @@ public class GroupSingleChoice extends Select2Choice<Group> {getSettings().setEscapeMarkup("onedev.server.groupChoiceFormatter.escapeMarkup");setConvertEmptyInputStringToNull(true);}-- @Override- protected void onBeforeRender() {- getSettings().setAllowClear(!isRequired());- super.onBeforeRender();- }@Overridepublic void renderHead(IHeaderResponse response) {diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/choice/IssueChoice.java b/server-core/src/main/java/io/onedev/server/web/component/issue/choice/IssueChoice.javaindex e532dcaf86..9fa51a9f14 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/choice/IssueChoice.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/choice/IssueChoice.java@@ -17,6 +17,8 @@ public class IssueChoice extends Select2Choice<Issue> {@Overrideprotected void onInitialize() {super.onInitialize();++ getSettings().setAllowClear(!isRequired());if (isRequired())getSettings().setPlaceholder("Choose issue...");else@@ -27,12 +29,6 @@ public class IssueChoice extends Select2Choice<Issue> {setConvertEmptyInputStringToNull(true);}- @Override- protected void onBeforeRender() {- getSettings().setAllowClear(!isRequired());- super.onBeforeRender();- }-@Overridepublic void renderHead(IHeaderResponse response) {super.renderHead(response);diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.javaindex b7bd0fc315..fcda160ad7 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java@@ -32,12 +32,14 @@ import io.onedev.server.buildspec.param.spec.ParamSpec;import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.entitymanager.IssueChangeManager;import io.onedev.server.entitymanager.IssueManager;+import io.onedev.server.entitymanager.MilestoneManager;import io.onedev.server.entitymanager.PullRequestManager;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.entitymanager.UserManager;import io.onedev.server.git.GitUtils;import io.onedev.server.model.Build;import io.onedev.server.model.Issue;+import io.onedev.server.model.Milestone;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;@@ -68,11 +70,12 @@ import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.page.project.builds.detail.dashboard.BuildDashboardPage;import io.onedev.server.web.page.project.commits.CommitDetailPage;import io.onedev.server.web.page.project.issues.detail.IssueActivitiesPage;+import io.onedev.server.web.page.project.issues.milestones.MilestoneIssuesPage;import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequestActivitiesPage;import io.onedev.server.web.util.ProjectAware;@SuppressWarnings("serial")-public abstract class FieldValuesPanel extends Panel implements EditContext {+public abstract class FieldValuesPanel extends Panel implements EditContext, ProjectAware {private final Mode userFieldDisplayMode;@@ -177,6 +180,11 @@ public abstract class FieldValuesPanel extends Panel implements EditContext {return getIssue().getFieldBean(fieldBeanClass, true);}+ @Override+ protected Project getProject() {+ return getIssue().getProject();+ }+};}@@ -280,6 +288,18 @@ public abstract class FieldValuesPanel extends Panel implements EditContext {} else {valueContainer.add(new Label("value", "<i>Not Found</i>").setEscapeModelStrings(false));}+ } else if (getField().getType().equals(FieldSpec.MILESTONE)) {+ Milestone milestone = OneDev.getInstance(MilestoneManager.class).findInHierarchy(getIssue().getProject(), value);+ if (milestone != null) {+ Fragment linkFrag = new Fragment("value", "linkFrag", FieldValuesPanel.this);+ Link<Void> milestoneLink = new BookmarkablePageLink<Void>("link", MilestoneIssuesPage.class,+ MilestoneIssuesPage.paramsOf(getIssue().getProject(), milestone));+ milestoneLink.add(new Label("label", milestone.getName()));+ linkFrag.add(milestoneLink);+ valueContainer.add(linkFrag);+ } else {+ valueContainer.add(new Label("value", "<i>Not Found</i>").setEscapeModelStrings(false));+ }} else if (getField().getType().equals(FieldSpec.COMMIT)) {if (ObjectId.isId(value)) {Fragment commmitFragment = new Fragment("value", "commitFrag", FieldValuesPanel.this);@@ -369,6 +389,11 @@ public abstract class FieldValuesPanel extends Panel implements EditContext {return null;}+ @Override+ public Project getProject() {+ return getIssue().getProject();+ }+protected abstract Issue getIssue();@Nullablediff --git a/server-core/src/main/java/io/onedev/server/web/component/job/JobSingleChoice.java b/server-core/src/main/java/io/onedev/server/web/component/job/JobSingleChoice.javaindex 4a3b7c759b..d89ee9674c 100644--- a/server-core/src/main/java/io/onedev/server/web/component/job/JobSingleChoice.java+++ b/server-core/src/main/java/io/onedev/server/web/component/job/JobSingleChoice.java@@ -18,6 +18,8 @@ public class JobSingleChoice extends Select2Choice<String> {@Overrideprotected void onInitialize() {super.onInitialize();++ getSettings().setAllowClear(!isRequired());if (isRequired())getSettings().setPlaceholder("Choose job...");elsediff --git a/server-core/src/main/java/io/onedev/server/web/component/milestone/choice/MilestoneSingleChoice.java b/server-core/src/main/java/io/onedev/server/web/component/milestone/choice/MilestoneSingleChoice.javaindex 27111f9410..988f398161 100644--- a/server-core/src/main/java/io/onedev/server/web/component/milestone/choice/MilestoneSingleChoice.java+++ b/server-core/src/main/java/io/onedev/server/web/component/milestone/choice/MilestoneSingleChoice.java@@ -19,6 +19,8 @@ public class MilestoneSingleChoice extends Select2Choice<Milestone> {@Overrideprotected void onInitialize() {super.onInitialize();++ getSettings().setAllowClear(!isRequired());if (isRequired())getSettings().setPlaceholder("Choose milestone...");else@@ -29,12 +31,6 @@ public class MilestoneSingleChoice extends Select2Choice<Milestone> {setConvertEmptyInputStringToNull(true);}- @Override- protected void onBeforeRender() {- getSettings().setAllowClear(!isRequired());- super.onBeforeRender();- }-@Overridepublic void renderHead(IHeaderResponse response) {super.renderHead(response);diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/choice/ProjectSingleChoice.java b/server-core/src/main/java/io/onedev/server/web/component/project/choice/ProjectSingleChoice.javaindex e491901550..7a070179fa 100644--- a/server-core/src/main/java/io/onedev/server/web/component/project/choice/ProjectSingleChoice.java+++ b/server-core/src/main/java/io/onedev/server/web/component/project/choice/ProjectSingleChoice.java@@ -17,6 +17,7 @@ public class ProjectSingleChoice extends Select2Choice<Project> {@Overrideprotected void onInitialize() {super.onInitialize();+ getSettings().setAllowClear(!isRequired());if (isRequired())getSettings().setPlaceholder("Choose a project...");else@@ -27,12 +28,6 @@ public class ProjectSingleChoice extends Select2Choice<Project> {setConvertEmptyInputStringToNull(true);}- @Override- protected void onBeforeRender() {- getSettings().setAllowClear(!isRequired());- super.onBeforeRender();- }-@Overridepublic void renderHead(IHeaderResponse response) {super.renderHead(response);diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/choice/PullRequestSingleChoice.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/choice/PullRequestSingleChoice.javaindex 90275a639a..7af25f7472 100644--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/choice/PullRequestSingleChoice.java+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/choice/PullRequestSingleChoice.java@@ -17,6 +17,7 @@ public class PullRequestSingleChoice extends Select2Choice<PullRequest> {@Overrideprotected void onInitialize() {super.onInitialize();+ getSettings().setAllowClear(!isRequired());if (isRequired())getSettings().setPlaceholder("Choose pull request...");else@@ -26,12 +27,6 @@ public class PullRequestSingleChoice extends Select2Choice<PullRequest> {getSettings().setEscapeMarkup("onedev.server.pullRequestChoiceFormatter.escapeMarkup");setConvertEmptyInputStringToNull(true);}-- @Override- protected void onBeforeRender() {- getSettings().setAllowClear(!isRequired());- super.onBeforeRender();- }@Overridepublic void renderHead(IHeaderResponse response) {diff --git a/server-core/src/main/java/io/onedev/server/web/component/stringchoice/StringSingleChoice.java b/server-core/src/main/java/io/onedev/server/web/component/stringchoice/StringSingleChoice.javaindex 8231ef7a51..1f4ddb7e0a 100644--- a/server-core/src/main/java/io/onedev/server/web/component/stringchoice/StringSingleChoice.java+++ b/server-core/src/main/java/io/onedev/server/web/component/stringchoice/StringSingleChoice.java@@ -17,16 +17,12 @@ public class StringSingleChoice extends Select2Choice<String> {@Overrideprotected void onInitialize() {super.onInitialize();++ getSettings().setAllowClear(!isRequired());getSettings().setFormatResult("onedev.server.choiceFormatter.formatResult");getSettings().setFormatSelection("onedev.server.choiceFormatter.formatSelection");getSettings().setEscapeMarkup("onedev.server.choiceFormatter.escapeMarkup");setConvertEmptyInputStringToNull(true);}- @Override- protected void onBeforeRender() {- getSettings().setAllowClear(!isRequired());- super.onBeforeRender();- }-}diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/choice/UserSingleChoice.java b/server-core/src/main/java/io/onedev/server/web/component/user/choice/UserSingleChoice.javaindex f6f892a4a9..9b83e62579 100644--- a/server-core/src/main/java/io/onedev/server/web/component/user/choice/UserSingleChoice.java+++ b/server-core/src/main/java/io/onedev/server/web/component/user/choice/UserSingleChoice.java@@ -19,6 +19,7 @@ public class UserSingleChoice extends Select2Choice<User> {@Overrideprotected void onInitialize() {super.onInitialize();+ getSettings().setAllowClear(!isRequired());if (isRequired())getSettings().setPlaceholder("Choose a user...");else@@ -29,12 +30,6 @@ public class UserSingleChoice extends Select2Choice<User> {setConvertEmptyInputStringToNull(true);}- @Override- protected void onBeforeRender() {- getSettings().setAllowClear(!isRequired());- super.onBeforeRender();- }-@Overridepublic void renderHead(IHeaderResponse response) {super.renderHead(response);diff --git a/server-core/src/main/java/io/onedev/server/web/editable/InplacePropertyEditLink.java b/server-core/src/main/java/io/onedev/server/web/editable/InplacePropertyEditLink.javaindex f515ad34be..cbdfff8259 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/InplacePropertyEditLink.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/InplacePropertyEditLink.java@@ -8,6 +8,7 @@ import org.apache.wicket.Component;import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;+import io.onedev.server.model.Project;import io.onedev.server.search.entity.issue.IssueQuery;import io.onedev.server.web.component.floating.AlignPlacement;import io.onedev.server.web.component.floating.FloatingPanel;@@ -50,6 +51,11 @@ public abstract class InplacePropertyEditLink extends DropdownLink {return InplacePropertyEditLink.this.getIssueQuery();}+ @Override+ public Project getProject() {+ return InplacePropertyEditLink.this.getProject();+ }+};}@@ -64,4 +70,9 @@ public abstract class InplacePropertyEditLink extends DropdownLink {return null;}+ @Nullable+ protected Project getProject() {+ return null;+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/InplacePropertyEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/InplacePropertyEditPanel.javaindex 0245bf5729..921fc9e720 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/InplacePropertyEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/InplacePropertyEditPanel.java@@ -14,9 +14,10 @@ import org.apache.wicket.markup.html.panel.Panel;import io.onedev.server.util.EditContext;import io.onedev.server.web.util.IssueQueryAware;+import io.onedev.server.web.util.ProjectAware;@SuppressWarnings("serial")-public abstract class InplacePropertyEditPanel extends Panel implements EditContext, IssueQueryAware {+public abstract class InplacePropertyEditPanel extends Panel implements EditContext, IssueQueryAware, ProjectAware {private final Serializable bean;diff --git a/server-core/src/main/java/io/onedev/server/web/editable/branchchoice/BranchMultiChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/branchchoice/BranchMultiChoiceEditor.javaindex 10cc758f2e..962f495a10 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/branchchoice/BranchMultiChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/branchchoice/BranchMultiChoiceEditor.java@@ -63,8 +63,6 @@ public class BranchMultiChoiceEditor extends PropertyEditor<List<String>> {};input.setLabel(Model.of(getDescriptor().getDisplayName()));- input.setRequired(descriptor.isPropertyRequired());-input.add(new AjaxFormComponentUpdatingBehavior("change"){@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/editable/branchchoice/BranchSingleChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/branchchoice/BranchSingleChoiceEditor.javaindex a2439a7da9..9fd1a48e4f 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/branchchoice/BranchSingleChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/branchchoice/BranchSingleChoiceEditor.java@@ -51,12 +51,11 @@ public class BranchSingleChoiceEditor extends PropertyEditor<String> {protected void onInitialize() {super.onInitialize();getSettings().configurePlaceholder(descriptor);+ getSettings().setAllowClear(!descriptor.isPropertyRequired());}};- // add this to control allowClear flag of select2- input.setRequired(descriptor.isPropertyRequired());input.setLabel(Model.of(getDescriptor().getDisplayName()));input.add(new AjaxFormComponentUpdatingBehavior("change"){diff --git a/server-core/src/main/java/io/onedev/server/web/editable/build/choice/BuildMultiChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/build/choice/BuildMultiChoiceEditor.javaindex 0087de1ef2..6e49762e63 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/build/choice/BuildMultiChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/build/choice/BuildMultiChoiceEditor.java@@ -72,8 +72,6 @@ public class BuildMultiChoiceEditor extends PropertyEditor<List<Long>> {};- // add this to control allowClear flag of select2- input.setRequired(descriptor.isPropertyRequired());input.setLabel(Model.of(getDescriptor().getDisplayName()));input.add(new AjaxFormComponentUpdatingBehavior("change"){diff --git a/server-core/src/main/java/io/onedev/server/web/editable/build/choice/BuildSingleChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/build/choice/BuildSingleChoiceEditor.javaindex 2392e71db6..be84826e10 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/build/choice/BuildSingleChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/build/choice/BuildSingleChoiceEditor.java@@ -59,12 +59,11 @@ public class BuildSingleChoiceEditor extends PropertyEditor<Long> {protected void onInitialize() {super.onInitialize();getSettings().configurePlaceholder(descriptor);+ getSettings().setAllowClear(!descriptor.isPropertyRequired());}};- // add this to control allowClear flag of select2- input.setRequired(descriptor.isPropertyRequired());input.setLabel(Model.of(getDescriptor().getDisplayName()));input.add(new AjaxFormComponentUpdatingBehavior("change"){diff --git a/server-core/src/main/java/io/onedev/server/web/editable/choice/MultiChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/choice/MultiChoiceEditor.javaindex 930ec1ea1c..77b18d4e63 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/choice/MultiChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/choice/MultiChoiceEditor.java@@ -94,7 +94,6 @@ public class MultiChoiceEditor extends PropertyEditor<List<String>> {};input.setLabel(Model.of(getDescriptor().getDisplayName()));- input.setRequired(descriptor.isPropertyRequired());input.add(new AjaxFormComponentUpdatingBehavior("change"){@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/editable/choice/SingleChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/choice/SingleChoiceEditor.javaindex 1333efa09b..b0783cc620 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/choice/SingleChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/choice/SingleChoiceEditor.java@@ -82,11 +82,10 @@ public class SingleChoiceEditor extends PropertyEditor<String> {protected void onInitialize() {super.onInitialize();getSettings().configurePlaceholder(descriptor);+ getSettings().setAllowClear(!descriptor.isPropertyRequired());}};- // add this to control allowClear flag of select2- input.setRequired(descriptor.isPropertyRequired());input.setLabel(Model.of(getDescriptor().getDisplayName()));input.add(new AjaxFormComponentUpdatingBehavior("change"){diff --git a/server-core/src/main/java/io/onedev/server/web/editable/enumeration/EnumPropertyEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/enumeration/EnumPropertyEditor.javaindex 5992bfd24f..1278449aeb 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/enumeration/EnumPropertyEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/enumeration/EnumPropertyEditor.java@@ -62,11 +62,10 @@ public class EnumPropertyEditor extends PropertyEditor<Enum<?>> {protected void onInitialize() {super.onInitialize();getSettings().configurePlaceholder(descriptor);+ getSettings().setAllowClear(!descriptor.isPropertyRequired());}};- // add this to control allowClear flag of select2- input.setRequired(descriptor.isPropertyRequired());input.setLabel(Model.of(getDescriptor().getDisplayName()));input.add(new AjaxFormComponentUpdatingBehavior("change") {diff --git a/server-core/src/main/java/io/onedev/server/web/editable/enumlist/EnumListPropertyEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/enumlist/EnumListPropertyEditor.javaindex 14e689e6ff..081f471131 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/enumlist/EnumListPropertyEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/enumlist/EnumListPropertyEditor.java@@ -69,7 +69,6 @@ public class EnumListPropertyEditor extends PropertyEditor<List<Enum<?>>> {};- input.setRequired(descriptor.isPropertyRequired());input.setLabel(Model.of(getDescriptor().getDisplayName()));input.add(new AjaxFormComponentUpdatingBehavior("change"){diff --git a/server-core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupMultiChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupMultiChoiceEditor.javaindex 0b3c70324b..c35d66a6b1 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupMultiChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupMultiChoiceEditor.java@@ -68,7 +68,6 @@ public class GroupMultiChoiceEditor extends PropertyEditor<Collection<String>> {};- input.setRequired(descriptor.isPropertyRequired());input.setLabel(Model.of(getDescriptor().getDisplayName()));input.add(new AjaxFormComponentUpdatingBehavior("change"){diff --git a/server-core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupSingleChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupSingleChoiceEditor.javaindex e73237ee00..7746628f4b 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupSingleChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupSingleChoiceEditor.java@@ -62,12 +62,11 @@ public class GroupSingleChoiceEditor extends PropertyEditor<String> {protected void onInitialize() {super.onInitialize();getSettings().configurePlaceholder(descriptor);+ getSettings().setAllowClear(!descriptor.isPropertyRequired());}};- // add this to control allowClear flag of select2- input.setRequired(descriptor.isPropertyRequired());input.setLabel(Model.of(getDescriptor().getDisplayName()));input.add(new AjaxFormComponentUpdatingBehavior("change"){diff --git a/server-core/src/main/java/io/onedev/server/web/editable/issue/choice/IssueChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/issue/choice/IssueChoiceEditor.javaindex dd057a512c..05124e8657 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/issue/choice/IssueChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/issue/choice/IssueChoiceEditor.java@@ -69,12 +69,11 @@ public class IssueChoiceEditor extends PropertyEditor<Long> {protected void onInitialize() {super.onInitialize();getSettings().configurePlaceholder(descriptor);+ getSettings().setAllowClear(!descriptor.isPropertyRequired());}};- // add this to control allowClear flag of select2- input.setRequired(descriptor.isPropertyRequired());input.setLabel(Model.of(getDescriptor().getDisplayName()));input.add(new AjaxFormComponentUpdatingBehavior("change"){diff --git a/server-core/src/main/java/io/onedev/server/web/editable/milestonechoice/MilestoneMultiChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/milestonechoice/MilestoneMultiChoiceEditor.javaindex ea30ab8434..bd089c2814 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/milestonechoice/MilestoneMultiChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/milestonechoice/MilestoneMultiChoiceEditor.java@@ -40,6 +40,7 @@ public class MilestoneMultiChoiceEditor extends PropertyEditor<List<String>> {super.onInitialize();List<Milestone> choices = new ArrayList<>();+ List<Milestone> selections = new ArrayList<>();ComponentContext componentContext = new ComponentContext(this);ComponentContext.push(componentContext);@@ -52,19 +53,18 @@ public class MilestoneMultiChoiceEditor extends PropertyEditor<List<String>> {} else {choices.addAll(Project.get().getSortedHierarchyMilestones());}++ if (getModelObject() != null) {+ MilestoneManager milestoneManager = OneDev.getInstance(MilestoneManager.class);+ for (String milestoneName: getModelObject()) {+ Milestone milestone = milestoneManager.findInHierarchy(Project.get(), milestoneName);+ if (milestone != null && choices.contains(milestone))+ selections.add(milestone);+ }+ }} finally {ComponentContext.pop();}-- List<Milestone> selections = new ArrayList<>();- if (getModelObject() != null) {- MilestoneManager milestoneManager = OneDev.getInstance(MilestoneManager.class);- for (String milestoneName: getModelObject()) {- Milestone milestone = milestoneManager.findInHierarchy(Project.get(), milestoneName);- if (milestone != null && choices.contains(milestone))- selections.add(milestone);- }- }input = new MilestoneMultiChoice("input", Model.of(selections), Model.of(choices)) {@@ -76,7 +76,6 @@ public class MilestoneMultiChoiceEditor extends PropertyEditor<List<String>> {};- input.setRequired(descriptor.isPropertyRequired());input.setLabel(Model.of(getDescriptor().getDisplayName()));input.add(new AjaxFormComponentUpdatingBehavior("change"){diff --git a/server-core/src/main/java/io/onedev/server/web/editable/milestonechoice/MilestoneSingleChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/milestonechoice/MilestoneSingleChoiceEditor.javaindex b0f84fdb19..4fdc1fd585 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/milestonechoice/MilestoneSingleChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/milestonechoice/MilestoneSingleChoiceEditor.java@@ -36,6 +36,7 @@ public class MilestoneSingleChoiceEditor extends PropertyEditor<String> {super.onInitialize();List<Milestone> choices = new ArrayList<>();+ Milestone selection;ComponentContext componentContext = new ComponentContext(this);ComponentContext.push(componentContext);@@ -48,31 +49,29 @@ public class MilestoneSingleChoiceEditor extends PropertyEditor<String> {} else {choices.addAll(Project.get().getSortedHierarchyMilestones());}++ if (getModelObject() != null)+ selection = Project.get().getHierarchyMilestone(getModelObject());+ else+ selection = null;++ if (selection != null && !choices.contains(selection))+ selection = null;} finally {ComponentContext.pop();}- Milestone selection;- if (getModelObject() != null)- selection = Project.get().getHierarchyMilestone(getModelObject());- else- selection = null;-- if (selection != null && !choices.contains(selection))- selection = null;-input = new MilestoneSingleChoice("input", Model.of(selection), Model.of(choices)) {@Overrideprotected void onInitialize() {super.onInitialize();getSettings().configurePlaceholder(descriptor);+ getSettings().setAllowClear(!descriptor.isPropertyRequired());}};- // add this to control allowClear flag of select2- input.setRequired(descriptor.isPropertyRequired());input.setLabel(Model.of(getDescriptor().getDisplayName()));input.add(new AjaxFormComponentUpdatingBehavior("change"){diff --git a/server-core/src/main/java/io/onedev/server/web/editable/parentchoice/ParentChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/parentchoice/ParentChoiceEditor.javaindex ab27b085e0..484fd87aeb 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/parentchoice/ParentChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/parentchoice/ParentChoiceEditor.java@@ -45,6 +45,7 @@ public class ParentChoiceEditor extends PropertyEditor<String> {protected void onInitialize() {super.onInitialize();getSettings().configurePlaceholder(descriptor);+ getSettings().setAllowClear(true);}};diff --git a/server-core/src/main/java/io/onedev/server/web/editable/project/choice/ProjectMultiChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/project/choice/ProjectMultiChoiceEditor.javaindex 7d91513cf8..f6f76dd384 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/project/choice/ProjectMultiChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/project/choice/ProjectMultiChoiceEditor.java@@ -67,7 +67,6 @@ public class ProjectMultiChoiceEditor extends PropertyEditor<List<String>> {}};- input.setRequired(descriptor.isPropertyRequired());input.setLabel(Model.of(getDescriptor().getDisplayName()));input.add(new AjaxFormComponentUpdatingBehavior("change"){diff --git a/server-core/src/main/java/io/onedev/server/web/editable/project/choice/ProjectSingleChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/project/choice/ProjectSingleChoiceEditor.javaindex ca902765d4..83cf39c35f 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/project/choice/ProjectSingleChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/project/choice/ProjectSingleChoiceEditor.java@@ -52,12 +52,11 @@ public class ProjectSingleChoiceEditor extends PropertyEditor<String> {protected void onInitialize() {super.onInitialize();getSettings().configurePlaceholder(descriptor);+ getSettings().setAllowClear(!descriptor.isPropertyRequired());}};- // add this to control allowClear flag of select2- input.setRequired(descriptor.isPropertyRequired());input.setLabel(Model.of(getDescriptor().getDisplayName()));input.add(new AjaxFormComponentUpdatingBehavior("change"){diff --git a/server-core/src/main/java/io/onedev/server/web/editable/pullrequest/choice/PullRequestChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/pullrequest/choice/PullRequestChoiceEditor.javaindex 6b0c39553e..0bf66c3faf 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/pullrequest/choice/PullRequestChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/pullrequest/choice/PullRequestChoiceEditor.java@@ -59,12 +59,11 @@ public class PullRequestChoiceEditor extends PropertyEditor<Long> {protected void onInitialize() {super.onInitialize();getSettings().configurePlaceholder(descriptor);+ getSettings().setAllowClear(!descriptor.isPropertyRequired());}};- // add this to control allowClear flag of select2- input.setRequired(descriptor.isPropertyRequired());input.setLabel(Model.of(getDescriptor().getDisplayName()));input.add(new AjaxFormComponentUpdatingBehavior("change"){diff --git a/server-core/src/main/java/io/onedev/server/web/editable/rolechoice/RoleMultiChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/rolechoice/RoleMultiChoiceEditor.javaindex 49540e40fa..c97a1ffa84 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/rolechoice/RoleMultiChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/rolechoice/RoleMultiChoiceEditor.java@@ -54,7 +54,6 @@ public class RoleMultiChoiceEditor extends PropertyEditor<List<String>> {};input.setConvertEmptyInputStringToNull(true);- input.setRequired(descriptor.isPropertyRequired());input.setLabel(Model.of(getDescriptor().getDisplayName()));input.add(new AjaxFormComponentUpdatingBehavior("change"){diff --git a/server-core/src/main/java/io/onedev/server/web/editable/rolechoice/RoleSingleChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/rolechoice/RoleSingleChoiceEditor.javaindex a1d9a4c5d0..4a04a60c0a 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/rolechoice/RoleSingleChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/rolechoice/RoleSingleChoiceEditor.java@@ -44,12 +44,11 @@ public class RoleSingleChoiceEditor extends PropertyEditor<String> {protected void onInitialize() {super.onInitialize();getSettings().configurePlaceholder(descriptor);+ getSettings().setAllowClear(!descriptor.isPropertyRequired());}};- // add this to control allowClear flag of select2- input.setRequired(descriptor.isPropertyRequired());input.setLabel(Model.of(getDescriptor().getDisplayName()));input.add(new AjaxFormComponentUpdatingBehavior("change"){diff --git a/server-core/src/main/java/io/onedev/server/web/editable/scriptchoice/ScriptChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/scriptchoice/ScriptChoiceEditor.javaindex 6b6e13d45d..219f104ee6 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/scriptchoice/ScriptChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/scriptchoice/ScriptChoiceEditor.java@@ -62,11 +62,10 @@ public class ScriptChoiceEditor extends PropertyEditor<String> {protected void onInitialize() {super.onInitialize();getSettings().configurePlaceholder(descriptor);+ getSettings().setAllowClear(!descriptor.isPropertyRequired());}};- // add this to control allowClear flag of select2- input.setRequired(descriptor.isPropertyRequired());input.setLabel(Model.of(getDescriptor().getDisplayName()));input.add(new AjaxFormComponentUpdatingBehavior("change"){diff --git a/server-core/src/main/java/io/onedev/server/web/editable/userchoice/UserMultiChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/userchoice/UserMultiChoiceEditor.javaindex 909e07e09a..9dbf9a1d82 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/userchoice/UserMultiChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/userchoice/UserMultiChoiceEditor.java@@ -77,7 +77,6 @@ public class UserMultiChoiceEditor extends PropertyEditor<List<String>> {};- input.setRequired(descriptor.isPropertyRequired());input.setLabel(Model.of(getDescriptor().getDisplayName()));input.add(new AjaxFormComponentUpdatingBehavior("change"){diff --git a/server-core/src/main/java/io/onedev/server/web/editable/userchoice/UserSingleChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/userchoice/UserSingleChoiceEditor.javaindex 53b28a82e2..1cf06e2107 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/userchoice/UserSingleChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/userchoice/UserSingleChoiceEditor.java@@ -70,12 +70,11 @@ public class UserSingleChoiceEditor extends PropertyEditor<String> {protected void onInitialize() {super.onInitialize();getSettings().configurePlaceholder(descriptor);+ getSettings().setAllowClear(!descriptor.isPropertyRequired());}};- // add this to control allowClear flag of select2- input.setRequired(descriptor.isPropertyRequired());input.setLabel(Model.of(getDescriptor().getDisplayName()));input.add(new AjaxFormComponentUpdatingBehavior("change"){