The Unified and Autonomous Development Platform
Fix issue #1165 - Able to specify default value by project in issue custom choice field
Robin Shen0154d50af5cb
diff --git a/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java b/server-core/src/main/java/io/onedev/server/migration/DataMigrator.javaindex a29e31f8d8..f7fa74a88a 100644--- a/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java+++ b/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java@@ -4841,8 +4841,38 @@ public class DataMigrator {buildSettingElement.addElement("jobProperties");}dom.writeToFile(file, false);+ } else if (file.getName().startsWith("Settings.xml")) {+ VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);+ for (Element element: dom.getRootElement().elements()) {+ if (element.elementTextTrim("key").equals("ISSUE")) {+ Element valueElement = element.element("value");+ if (valueElement != null) {+ for (Element fieldSpecElement: valueElement.element("fieldSpecs").elements()) {+ if (fieldSpecElement.getName().equals("io.onedev.server.model.support.issue.field.spec.ChoiceField")) {+ Element defaultValueProviderElement = fieldSpecElement.element("defaultValueProvider");+ if (defaultValueProviderElement != null+ && defaultValueProviderElement.attributeValue("class").contains("SpecifiedDefaultValue")) {+ Element defaultValueElement = defaultValueProviderElement.element("value");+ Element defaultValuesElement = defaultValueProviderElement.addElement("defaultValues");+ defaultValueElement.detach();+ defaultValuesElement.addElement("io.onedev.server.model.support.inputspec.choiceinput.defaultvalueprovider.DefaultValue").add(defaultValueElement);+ }+ Element defaultMultiValueProviderElement = fieldSpecElement.element("defaultMultiValueProvider");+ if (defaultMultiValueProviderElement != null+ && defaultMultiValueProviderElement.attributeValue("class").contains("SpecifiedDefaultMultiValue")) {+ Element defaultValueElement = defaultMultiValueProviderElement.element("value");+ Element defaultValuesElement = defaultMultiValueProviderElement.addElement("defaultValues");+ defaultValueElement.detach();+ defaultValuesElement.addElement("io.onedev.server.model.support.inputspec.choiceinput.defaultmultivalueprovider.DefaultMultiValue").add(defaultValueElement);+ }+ }+ }+ }+ }+ }+ dom.writeToFile(file, false);}}}-+}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.javaindex 0bd62209b8..a91524c03c 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@@ -21,6 +21,7 @@ import io.onedev.server.model.Issue;import io.onedev.server.model.Project;import io.onedev.server.model.support.inputspec.choiceinput.choiceprovider.Choice;import io.onedev.server.model.support.inputspec.choiceinput.choiceprovider.SpecifiedChoices;+import io.onedev.server.model.support.inputspec.choiceinput.defaultvalueprovider.DefaultValue;import io.onedev.server.model.support.inputspec.choiceinput.defaultvalueprovider.SpecifiedDefaultValue;import io.onedev.server.model.support.inputspec.showcondition.ShowCondition;import io.onedev.server.model.support.inputspec.showcondition.ValueIsOneOf;@@ -108,7 +109,10 @@ public class GlobalIssueSetting implements Serializable {type.setChoiceProvider(specifiedChoices);SpecifiedDefaultValue specifiedDefaultValue = new SpecifiedDefaultValue();- specifiedDefaultValue.setValue("Bug");+ DefaultValue defaultValue = new DefaultValue();+ defaultValue.setValue("New Feature");+ specifiedDefaultValue.getDefaultValues().add(defaultValue);+type.setDefaultValueProvider(specifiedDefaultValue);fieldSpecs.add(type);@@ -143,7 +147,9 @@ public class GlobalIssueSetting implements Serializable {priority.setChoiceProvider(specifiedChoices);specifiedDefaultValue = new SpecifiedDefaultValue();- specifiedDefaultValue.setValue("Normal");+ defaultValue = new DefaultValue();+ defaultValue.setValue("Normal");+ specifiedDefaultValue.getDefaultValues().add(defaultValue);priority.setDefaultValueProvider(specifiedDefaultValue);fieldSpecs.add(priority);diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/defaultmultivalueprovider/DefaultMultiValue.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/defaultmultivalueprovider/DefaultMultiValue.javanew file mode 100755index 0000000000..dfab6bd295--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/defaultmultivalueprovider/DefaultMultiValue.java@@ -0,0 +1,65 @@+package io.onedev.server.model.support.inputspec.choiceinput.defaultmultivalueprovider;++import io.onedev.commons.codeassist.InputSuggestion;+import io.onedev.server.OneDev;+import io.onedev.server.model.support.inputspec.choiceinput.choiceprovider.ChoiceProvider;+import io.onedev.server.util.EditContext;+import io.onedev.server.web.editable.annotation.Editable;+import io.onedev.server.web.editable.annotation.OmitName;+import io.onedev.server.web.editable.annotation.Patterns;+import io.onedev.server.web.util.SuggestionUtils;++import javax.validation.Validator;+import javax.validation.constraints.NotEmpty;+import java.io.Serializable;+import java.util.ArrayList;+import java.util.List;++@Editable(name="Value")+public class DefaultMultiValue implements Serializable {++ private static final long serialVersionUID = 1L;++ private List<String> value;++ private String applicableProjects;++ @Editable(name="Literal value", order=100)+ @io.onedev.server.web.editable.annotation.ChoiceProvider("getValueChoices")+ @NotEmpty+ @OmitName+ public List<String> getValue() {+ return value;+ }++ public void setValue(List<String> value) {+ this.value = value;+ }++ @Editable(order=200, placeholder="All projects", description="Specify applicable projects separated by space. "+ + "Use '**', '*' or '?' for <a href='https://docs.onedev.io/appendix/path-wildcard' target='_blank'>path wildcard match</a>. "+ + "Prefix with '-' to exclude. Leave empty for all projects")+ @Patterns(suggester="suggestProjects", path=true)+ public String getApplicableProjects() {+ return applicableProjects;+ }++ public void setApplicableProjects(String applicableProjects) {+ this.applicableProjects = applicableProjects;+ }++ @SuppressWarnings("unused")+ private static List<InputSuggestion> suggestProjects(String matchWith) {+ return SuggestionUtils.suggestProjectPaths(matchWith);+ }++ @SuppressWarnings("unused")+ private static List<String> getValueChoices() {+ ChoiceProvider choiceProvider = (ChoiceProvider) EditContext.get(1).getInputValue("choiceProvider");+ if (choiceProvider != null && OneDev.getInstance(Validator.class).validate(choiceProvider).isEmpty())+ return new ArrayList<>(choiceProvider.getChoices(true).keySet());+ else+ return new ArrayList<>();+ }++}diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/defaultmultivalueprovider/SpecifiedDefaultMultiValue.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/defaultmultivalueprovider/SpecifiedDefaultMultiValue.javaindex 355353f2e2..29ddb42d2a 100755--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/defaultmultivalueprovider/SpecifiedDefaultMultiValue.java+++ b/server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/defaultmultivalueprovider/SpecifiedDefaultMultiValue.java@@ -1,51 +1,48 @@package io.onedev.server.model.support.inputspec.choiceinput.defaultmultivalueprovider;-import java.util.ArrayList;-import java.util.List;--import javax.validation.Validator;--import javax.validation.constraints.NotEmpty;--import com.google.common.collect.Lists;--import io.onedev.server.OneDev;-import io.onedev.server.model.support.inputspec.choiceinput.choiceprovider.ChoiceProvider;-import io.onedev.server.util.EditContext;+import io.onedev.server.model.Project;+import io.onedev.server.util.match.Matcher;+import io.onedev.server.util.match.PathMatcher;+import io.onedev.server.util.patternset.PatternSet;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.OmitName;-@Editable(order=100, name="Use specified default value")+import javax.validation.constraints.Size;+import java.util.ArrayList;+import java.util.List;++@Editable(order=100, name="Use specified default value",+ description = "For a particular project, the first matching entry will be used")public class SpecifiedDefaultMultiValue implements DefaultMultiValueProvider {private static final long serialVersionUID = 1L;- private List<String> value;+ private List<DefaultMultiValue> defaultValues = new ArrayList<>();- @Editable(name="Literal default value")- @io.onedev.server.web.editable.annotation.ChoiceProvider("getValueChoices")- @NotEmpty+ @Editable+ @Size(min=1, message="At least one entry should be specified")@OmitName- public List<String> getValue() {- return value;+ public List<DefaultMultiValue> getDefaultValues() {+ return defaultValues;}- public void setValue(List<String> value) {- this.value = value;+ public void setDefaultValues(List<DefaultMultiValue> defaultValues) {+ this.defaultValues = defaultValues;}@Overridepublic List<String> getDefaultValue() {- return getValue();+ Project project = Project.get();+ if (project != null) {+ Matcher matcher = new PathMatcher();+ for (DefaultMultiValue defaultValue : getDefaultValues()) {+ if (defaultValue.getApplicableProjects() == null+ || PatternSet.parse(defaultValue.getApplicableProjects()).matches(matcher, project.getPath())) {+ return defaultValue.getValue();+ }+ }+ }+ return new ArrayList<>();}- @SuppressWarnings("unused")- private static List<String> getValueChoices() {- ChoiceProvider choiceProvider = (ChoiceProvider) EditContext.get(1).getInputValue("choiceProvider");- if (choiceProvider != null && OneDev.getInstance(Validator.class).validate(choiceProvider).isEmpty())- return new ArrayList<>(choiceProvider.getChoices(true).keySet());- else- return Lists.newArrayList();- }-}diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/defaultvalueprovider/DefaultValue.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/defaultvalueprovider/DefaultValue.javanew file mode 100755index 0000000000..8f2e827d2b--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/defaultvalueprovider/DefaultValue.java@@ -0,0 +1,63 @@+package io.onedev.server.model.support.inputspec.choiceinput.defaultvalueprovider;++import io.onedev.commons.codeassist.InputSuggestion;+import io.onedev.server.OneDev;+import io.onedev.server.model.support.inputspec.choiceinput.choiceprovider.ChoiceProvider;+import io.onedev.server.util.EditContext;+import io.onedev.server.web.editable.annotation.Editable;+import io.onedev.server.web.editable.annotation.Patterns;+import io.onedev.server.web.util.SuggestionUtils;++import javax.validation.Validator;+import javax.validation.constraints.NotEmpty;+import java.io.Serializable;+import java.util.ArrayList;+import java.util.List;++@Editable(name="Value")+public class DefaultValue implements Serializable {++ private static final long serialVersionUID = 1L;++ private String value;++ private String applicableProjects;++ @Editable(order=100, name="Literal value")+ @io.onedev.server.web.editable.annotation.ChoiceProvider("getValueChoices")+ @NotEmpty+ public String getValue() {+ return value;+ }++ public void setValue(String value) {+ this.value = value;+ }++ @Editable(order=200, placeholder="All projects", description="Specify applicable projects separated by space. "+ + "Use '**', '*' or '?' for <a href='https://docs.onedev.io/appendix/path-wildcard' target='_blank'>path wildcard match</a>. "+ + "Prefix with '-' to exclude. Leave empty for all projects")+ @Patterns(suggester="suggestProjects", path=true)+ public String getApplicableProjects() {+ return applicableProjects;+ }++ public void setApplicableProjects(String applicableProjects) {+ this.applicableProjects = applicableProjects;+ }++ @SuppressWarnings("unused")+ private static List<InputSuggestion> suggestProjects(String matchWith) {+ return SuggestionUtils.suggestProjectPaths(matchWith);+ }++ @SuppressWarnings("unused")+ private static List<String> getValueChoices() {+ ChoiceProvider choiceProvider = (ChoiceProvider) EditContext.get(1).getInputValue("choiceProvider");+ if (choiceProvider != null && OneDev.getInstance(Validator.class).validate(choiceProvider).isEmpty())+ return new ArrayList<>(choiceProvider.getChoices(true).keySet());+ else+ return new ArrayList<>();+ }++}diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/defaultvalueprovider/SpecifiedDefaultValue.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/defaultvalueprovider/SpecifiedDefaultValue.javaindex a1c7290504..f5f74b095e 100755--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/defaultvalueprovider/SpecifiedDefaultValue.java+++ b/server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/defaultvalueprovider/SpecifiedDefaultValue.java@@ -1,49 +1,48 @@package io.onedev.server.model.support.inputspec.choiceinput.defaultvalueprovider;-import java.util.ArrayList;-import java.util.List;--import javax.validation.Validator;--import javax.validation.constraints.NotEmpty;--import io.onedev.server.OneDev;-import io.onedev.server.model.support.inputspec.choiceinput.choiceprovider.ChoiceProvider;-import io.onedev.server.util.EditContext;+import io.onedev.server.model.Project;+import io.onedev.server.util.match.Matcher;+import io.onedev.server.util.match.PathMatcher;+import io.onedev.server.util.patternset.PatternSet;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.OmitName;-@Editable(order=100, name="Use specified default value")+import javax.validation.constraints.Size;+import java.util.ArrayList;+import java.util.List;++@Editable(order=100, name="Use specified default value",+ description = "For a particular project, the first matching entry will be used")public class SpecifiedDefaultValue implements DefaultValueProvider {private static final long serialVersionUID = 1L;- private String value;+ private List<DefaultValue> defaultValues = new ArrayList<>();- @Editable(name="Literal default value")- @io.onedev.server.web.editable.annotation.ChoiceProvider("getValueChoices")- @NotEmpty+ @Editable+ @Size(min=1, message="At least one entry should be specified")@OmitName- public String getValue() {- return value;+ public List<DefaultValue> getDefaultValues() {+ return defaultValues;}- public void setValue(String value) {- this.value = value;+ public void setDefaultValues(List<DefaultValue> defaultValues) {+ this.defaultValues = defaultValues;}@Overridepublic String getDefaultValue() {- return getValue();+ Project project = Project.get();+ if (project != null) {+ Matcher matcher = new PathMatcher();+ for (DefaultValue defaultValue : getDefaultValues()) {+ if (defaultValue.getApplicableProjects() == null+ || PatternSet.parse(defaultValue.getApplicableProjects()).matches(matcher, project.getPath())) {+ return defaultValue.getValue();+ }+ }+ }+ return null;}- @SuppressWarnings("unused")- private static List<String> getValueChoices() {- ChoiceProvider choiceProvider = (ChoiceProvider) EditContext.get(1).getInputValue("choiceProvider");- if (choiceProvider != null && OneDev.getInstance(Validator.class).validate(choiceProvider).isEmpty())- return new ArrayList<>(choiceProvider.getChoices(true).keySet());- else- return new ArrayList<>();- }-}