The Unified and Autonomous Development Platform
Fix issue #1256 - Able to specify per project default value for issue field of user type
Robin Shen8d0a47ae86c4
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/UserChoiceParam.java b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/userchoiceparam/UserChoiceParam.javasimilarity index 87%rename from server-core/src/main/java/io/onedev/server/buildspec/param/spec/UserChoiceParam.javarename to server-core/src/main/java/io/onedev/server/buildspec/param/spec/userchoiceparam/UserChoiceParam.javaindex c74030b057..301d27a8c1 100755--- a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/UserChoiceParam.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/userchoiceparam/UserChoiceParam.java@@ -1,4 +1,4 @@-package io.onedev.server.buildspec.param.spec;+package io.onedev.server.buildspec.param.spec.userchoiceparam;import java.util.List;import java.util.Map;@@ -6,16 +6,17 @@ import java.util.Map;import javax.validation.Valid;import javax.validation.constraints.NotNull;+import io.onedev.server.buildspec.param.spec.ParamSpec;+import io.onedev.server.buildspec.param.spec.userchoiceparam.defaultmultivalueprovider.DefaultMultiValueProvider;+import io.onedev.server.buildspec.param.spec.userchoiceparam.defaultvalueprovider.DefaultValueProvider;import io.onedev.server.buildspecmodel.inputspec.userchoiceinput.UserChoiceInput;import io.onedev.server.buildspecmodel.inputspec.userchoiceinput.choiceprovider.AllUsers;import io.onedev.server.buildspecmodel.inputspec.userchoiceinput.choiceprovider.ChoiceProvider;-import io.onedev.server.buildspecmodel.inputspec.userchoiceinput.defaultmultivalueprovider.DefaultMultiValueProvider;-import io.onedev.server.buildspecmodel.inputspec.userchoiceinput.defaultvalueprovider.DefaultValueProvider;import io.onedev.server.util.EditContext;import io.onedev.server.annotation.Editable;import io.onedev.server.annotation.ShowCondition;-@Editable(order=150, name=ParamSpec.USER)+@Editable(order=150, name= ParamSpec.USER)public class UserChoiceParam extends ParamSpec {private static final long serialVersionUID = 1L;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/userchoiceparam/defaultmultivalueprovider/DefaultMultiValueProvider.java b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/userchoiceparam/defaultmultivalueprovider/DefaultMultiValueProvider.javanew file mode 100755index 0000000000..46972d88fc--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/userchoiceparam/defaultmultivalueprovider/DefaultMultiValueProvider.java@@ -0,0 +1,8 @@+package io.onedev.server.buildspec.param.spec.userchoiceparam.defaultmultivalueprovider;++import io.onedev.server.annotation.Editable;++@Editable+public interface DefaultMultiValueProvider extends io.onedev.server.buildspecmodel.inputspec.userchoiceinput.DefaultMultiValueProvider {++}diff --git a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/userchoiceinput/defaultmultivalueprovider/ScriptingDefaultMultiValue.java b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/userchoiceparam/defaultmultivalueprovider/ScriptingDefaultMultiValue.javasimilarity index 88%rename from server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/userchoiceinput/defaultmultivalueprovider/ScriptingDefaultMultiValue.javarename to server-core/src/main/java/io/onedev/server/buildspec/param/spec/userchoiceparam/defaultmultivalueprovider/ScriptingDefaultMultiValue.javaindex 3b1700e5dc..1eb2742d2b 100755--- a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/userchoiceinput/defaultmultivalueprovider/ScriptingDefaultMultiValue.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/userchoiceparam/defaultmultivalueprovider/ScriptingDefaultMultiValue.java@@ -1,13 +1,12 @@-package io.onedev.server.buildspecmodel.inputspec.userchoiceinput.defaultmultivalueprovider;+package io.onedev.server.buildspec.param.spec.userchoiceparam.defaultmultivalueprovider;-import java.util.List;--import javax.validation.constraints.NotEmpty;--import io.onedev.server.util.GroovyUtils;import io.onedev.server.annotation.Editable;import io.onedev.server.annotation.OmitName;import io.onedev.server.annotation.ScriptChoice;+import io.onedev.server.util.GroovyUtils;++import javax.validation.constraints.NotEmpty;+import java.util.List;@Editable(order=400, name="Evaluate script to get default value")public class ScriptingDefaultMultiValue implements DefaultMultiValueProvider {@@ -16,7 +15,7 @@ public class ScriptingDefaultMultiValue implements DefaultMultiValueProvider {private String scriptName;- @Editable(description="Groovy script to be evaluated. It should return list of user login name. "+ @Editable(description="Groovy script to be evaluated. It should return list of string. "+ "Check <a href='https://docs.onedev.io/appendix/scripting' target='_blank'>scripting help</a> for details")@ScriptChoice@OmitNamediff --git a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/userchoiceinput/defaultmultivalueprovider/SpecifiedDefaultMultiValue.java b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/userchoiceparam/defaultmultivalueprovider/SpecifiedDefaultMultiValue.javasimilarity index 70%rename from server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/userchoiceinput/defaultmultivalueprovider/SpecifiedDefaultMultiValue.javarename to server-core/src/main/java/io/onedev/server/buildspec/param/spec/userchoiceparam/defaultmultivalueprovider/SpecifiedDefaultMultiValue.javaindex ac4342da9e..7c76f62efe 100755--- a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/userchoiceinput/defaultmultivalueprovider/SpecifiedDefaultMultiValue.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/userchoiceparam/defaultmultivalueprovider/SpecifiedDefaultMultiValue.java@@ -1,19 +1,17 @@-package io.onedev.server.buildspecmodel.inputspec.userchoiceinput.defaultmultivalueprovider;--import java.util.ArrayList;-import java.util.List;--import javax.validation.Validator;--import javax.validation.constraints.NotEmpty;+package io.onedev.server.buildspec.param.spec.userchoiceparam.defaultmultivalueprovider;+import com.google.common.collect.Lists;import io.onedev.server.OneDev;+import io.onedev.server.annotation.Editable;+import io.onedev.server.annotation.OmitName;import io.onedev.server.buildspecmodel.inputspec.userchoiceinput.choiceprovider.ChoiceProvider;import io.onedev.server.model.User;import io.onedev.server.util.EditContext;-import io.onedev.server.annotation.Editable;-import io.onedev.server.annotation.OmitName;-import io.onedev.server.annotation.UserChoice;++import javax.validation.Validator;+import javax.validation.constraints.NotEmpty;+import java.util.List;+import java.util.stream.Collectors;@Editable(order=100, name="Use specified default value")public class SpecifiedDefaultMultiValue implements DefaultMultiValueProvider {@@ -23,7 +21,7 @@ public class SpecifiedDefaultMultiValue implements DefaultMultiValueProvider {private List<String> value;@Editable(name="Literal default value")- @UserChoice("getValueChoices")+ @io.onedev.server.annotation.ChoiceProvider("getValueChoices")@NotEmpty@OmitNamepublic List<String> getValue() {@@ -40,12 +38,12 @@ public class SpecifiedDefaultMultiValue implements DefaultMultiValueProvider {}@SuppressWarnings("unused")- private static List<User> getValueChoices() {+ private static List<String> getValueChoices() {ChoiceProvider choiceProvider = (ChoiceProvider) EditContext.get(1).getInputValue("choiceProvider");- if (choiceProvider != null && OneDev.getInstance(Validator.class).validate(choiceProvider).isEmpty())- return choiceProvider.getChoices(true);+ if (choiceProvider != null && OneDev.getInstance(Validator.class).validate(choiceProvider).isEmpty())+ return choiceProvider.getChoices(true).stream().map(User::getName).collect(Collectors.toList());else- return new ArrayList<>();+ return Lists.newArrayList();}-+}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/userchoiceparam/defaultvalueprovider/DefaultValueProvider.java b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/userchoiceparam/defaultvalueprovider/DefaultValueProvider.javanew file mode 100755index 0000000000..943e98cb91--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/userchoiceparam/defaultvalueprovider/DefaultValueProvider.java@@ -0,0 +1,8 @@+package io.onedev.server.buildspec.param.spec.userchoiceparam.defaultvalueprovider;++import io.onedev.server.annotation.Editable;++@Editable+public interface DefaultValueProvider extends io.onedev.server.buildspecmodel.inputspec.userchoiceinput.DefaultValueProvider {++}diff --git a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/userchoiceinput/defaultvalueprovider/ScriptingDefaultValue.java b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/userchoiceparam/defaultvalueprovider/ScriptingDefaultValue.javasimilarity index 88%rename from server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/userchoiceinput/defaultvalueprovider/ScriptingDefaultValue.javarename to server-core/src/main/java/io/onedev/server/buildspec/param/spec/userchoiceparam/defaultvalueprovider/ScriptingDefaultValue.javaindex 1f2f657002..d992e367c5 100755--- a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/userchoiceinput/defaultvalueprovider/ScriptingDefaultValue.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/userchoiceparam/defaultvalueprovider/ScriptingDefaultValue.java@@ -1,11 +1,11 @@-package io.onedev.server.buildspecmodel.inputspec.userchoiceinput.defaultvalueprovider;+package io.onedev.server.buildspec.param.spec.userchoiceparam.defaultvalueprovider;-import javax.validation.constraints.NotEmpty;--import io.onedev.server.util.GroovyUtils;import io.onedev.server.annotation.Editable;import io.onedev.server.annotation.OmitName;import io.onedev.server.annotation.ScriptChoice;+import io.onedev.server.util.GroovyUtils;++import javax.validation.constraints.NotEmpty;@Editable(order=400, name="Evaluate script to get default value")public class ScriptingDefaultValue implements DefaultValueProvider {@@ -14,7 +14,7 @@ public class ScriptingDefaultValue implements DefaultValueProvider {private String scriptName;- @Editable(description="Groovy script to be evaluated. It should return login name of an user. "+ @Editable(description="Groovy script to be evaluated. It should return a <i>string</i> value. "+ "Check <a href='https://docs.onedev.io/appendix/scripting' target='_blank'>scripting help</a> for details")@ScriptChoice@OmitNamediff --git a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/userchoiceparam/defaultvalueprovider/SpecifiedDefaultValue.java b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/userchoiceparam/defaultvalueprovider/SpecifiedDefaultValue.javanew file mode 100755index 0000000000..c09cbde15b--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/userchoiceparam/defaultvalueprovider/SpecifiedDefaultValue.java@@ -0,0 +1,49 @@+package io.onedev.server.buildspec.param.spec.userchoiceparam.defaultvalueprovider;++import io.onedev.server.OneDev;+import io.onedev.server.annotation.Editable;+import io.onedev.server.annotation.OmitName;+import io.onedev.server.buildspecmodel.inputspec.userchoiceinput.choiceprovider.ChoiceProvider;+import io.onedev.server.model.User;+import io.onedev.server.util.EditContext;++import javax.validation.Validator;+import javax.validation.constraints.NotEmpty;+import java.util.ArrayList;+import java.util.List;+import java.util.stream.Collectors;++@Editable(order=100, name="Use specified default value")+public class SpecifiedDefaultValue implements DefaultValueProvider {++ private static final long serialVersionUID = 1L;++ private String value;++ @Editable(name="Literal default value")+ @io.onedev.server.annotation.ChoiceProvider("getValueChoices")+ @NotEmpty+ @OmitName+ public String getValue() {+ return value;+ }++ public void setValue(String value) {+ this.value = value;+ }++ @Override+ public String getDefaultValue() {+ return getValue();+ }++ @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 choiceProvider.getChoices(true).stream().map(User::getName).collect(Collectors.toList());+ else+ return new ArrayList<>();+ }++}diff --git a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/userchoiceinput/defaultmultivalueprovider/DefaultMultiValueProvider.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/userchoiceinput/DefaultMultiValueProvider.javasimilarity index 90%rename from server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/userchoiceinput/defaultmultivalueprovider/DefaultMultiValueProvider.javarename to server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/userchoiceinput/DefaultMultiValueProvider.javaindex 5467b2eff6..c990d5dbb7 100755--- a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/userchoiceinput/defaultmultivalueprovider/DefaultMultiValueProvider.java+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/userchoiceinput/DefaultMultiValueProvider.java@@ -1,4 +1,4 @@-package io.onedev.server.buildspecmodel.inputspec.userchoiceinput.defaultmultivalueprovider;+package io.onedev.server.buildspecmodel.inputspec.userchoiceinput;import java.io.Serializable;import java.util.List;diff --git a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/userchoiceinput/defaultvalueprovider/DefaultValueProvider.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/userchoiceinput/DefaultValueProvider.javasimilarity index 91%rename from server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/userchoiceinput/defaultvalueprovider/DefaultValueProvider.javarename to server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/userchoiceinput/DefaultValueProvider.javaindex 3e3df15f92..059a9eb562 100755--- a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/userchoiceinput/defaultvalueprovider/DefaultValueProvider.java+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/userchoiceinput/DefaultValueProvider.java@@ -1,4 +1,4 @@-package io.onedev.server.buildspecmodel.inputspec.userchoiceinput.defaultvalueprovider;+package io.onedev.server.buildspecmodel.inputspec.userchoiceinput;import java.io.Serializable;diff --git a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/userchoiceinput/UserChoiceInput.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/userchoiceinput/UserChoiceInput.javaindex 688cdff5a4..1dacf334d8 100755--- a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/userchoiceinput/UserChoiceInput.java+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/userchoiceinput/UserChoiceInput.java@@ -9,10 +9,8 @@ import com.google.common.collect.Lists;import io.onedev.server.OneDev;import io.onedev.server.buildspecmodel.inputspec.userchoiceinput.choiceprovider.ChoiceProvider;-import io.onedev.server.buildspecmodel.inputspec.userchoiceinput.defaultvalueprovider.DefaultValueProvider;import io.onedev.server.entitymanager.UserManager;import io.onedev.server.buildspecmodel.inputspec.InputSpec;-import io.onedev.server.buildspecmodel.inputspec.userchoiceinput.defaultmultivalueprovider.DefaultMultiValueProvider;public class UserChoiceInput {diff --git a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/userchoiceinput/defaultvalueprovider/SpecifiedDefaultValue.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/userchoiceinput/defaultvalueprovider/SpecifiedDefaultValue.javadeleted file mode 100755index 78a780f5b3..0000000000--- a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/userchoiceinput/defaultvalueprovider/SpecifiedDefaultValue.java+++ /dev/null@@ -1,50 +0,0 @@-package io.onedev.server.buildspecmodel.inputspec.userchoiceinput.defaultvalueprovider;--import java.util.ArrayList;-import java.util.List;--import javax.validation.constraints.NotEmpty;--import com.google.common.collect.Sets;--import io.onedev.server.OneDev;-import io.onedev.server.entitymanager.UserManager;-import io.onedev.server.model.User;-import io.onedev.server.util.facade.UserCache;-import io.onedev.server.annotation.Editable;-import io.onedev.server.annotation.OmitName;-import io.onedev.server.annotation.UserChoice;--@Editable(order=100, name="Use specified default value")-public class SpecifiedDefaultValue implements DefaultValueProvider {-- private static final long serialVersionUID = 1L;-- private String value;-- @Editable(name="Literal default value")- @UserChoice("getValueChoices")- @NotEmpty- @OmitName- public String getValue() {- return value;- }-- public void setValue(String value) {- this.value = value;- }-- @Override- public String getDefaultValue() {- return getValue();- }-- @SuppressWarnings("unused")- private static List<User> getValueChoices() {- UserCache cache = OneDev.getInstance(UserManager.class).cloneCache();- List<User> users = new ArrayList<>(cache.getUsers());- users.sort(cache.comparingDisplayName(Sets.newHashSet()));- return users;- }--}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultRoleManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultRoleManager.javaindex d9ed1d2ed6..48f6ebc831 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultRoleManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultRoleManager.java@@ -192,7 +192,7 @@ public class DefaultRoleManager extends BaseEntityManager<Role> implements RoleMjobPrivilege.setRunJob(true);codeWriter.getJobPrivileges().add(jobPrivilege);- update(codeWriter, new ArrayList<>(), null);+ create(codeWriter, new ArrayList<>());Role codeReader = new Role();codeReader.setName("Code Reader");@@ -208,7 +208,7 @@ public class DefaultRoleManager extends BaseEntityManager<Role> implements RoleMjobPrivilege.setJobNames("*");codeReader.getJobPrivileges().add(jobPrivilege);- update(codeReader, new ArrayList<>(), null);+ create(codeReader, new ArrayList<>());Role issueReporter = new Role();issueReporter.setName("Issue Reporter");@@ -224,7 +224,7 @@ public class DefaultRoleManager extends BaseEntityManager<Role> implements RoleMjobPrivilege.setJobNames("*");issueReporter.getJobPrivileges().add(jobPrivilege);- update(issueReporter, new ArrayList<>(), null);+ create(issueReporter, new ArrayList<>());}@Sessionaldiff --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 b19399d525..eab506fcb5 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@@ -5091,5 +5091,92 @@ public class DataMigrator {dom.writeToFile(file, false);}}+ }++ private void migrate115(File dataDir, Stack<Integer> versions) {+ for (File file: dataDir.listFiles()) {+ 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.UserChoiceField")) {+ 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.buildspecmodel.inputspec.userchoiceinput.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.buildspecmodel.inputspec.userchoiceinput.defaultmultivalueprovider.DefaultMultiValue").add(defaultValueElement);+ }+ }+ }+ }+ }+ }+ dom.writeToFile(file, false);+ }+ }+ }++ private void migrate116(File dataDir, Stack<Integer> versions) {+ for (File file : dataDir.listFiles()) {+ if (file.getName().startsWith("Settings.xml")) {+ VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);+ for (Node node : dom.selectNodes("//io.onedev.server.model.support.issue.field.spec.UserChoiceField")) {+ if (node instanceof Element) {+ Element element = (Element) node;+ element.setName("io.onedev.server.model.support.issue.field.spec.userchoicefield.UserChoiceField");+ }+ }+ for (Node node : dom.selectNodes("//defaultValueProvider")) {+ if (node instanceof Element) {+ Element element = (Element) node;+ String clazz = element.attributeValue("class");+ if (clazz != null) {+ clazz = clazz.replace(+ "io.onedev.server.buildspecmodel.inputspec.userchoiceinput.defaultvalueprovider.",+ "io.onedev.server.model.support.issue.field.spec.userchoicefield.defaultvalueprovider.");+ element.addAttribute("class", clazz);+ }+ }+ }+ for (Node node : dom.selectNodes("//defaultMultiValueProvider")) {+ if (node instanceof Element) {+ Element element = (Element) node;+ String clazz = element.attributeValue("class");+ if (clazz != null) {+ clazz = clazz.replace(+ "io.onedev.server.buildspecmodel.inputspec.userchoiceinput.defaultmultivalueprovider.",+ "io.onedev.server.model.support.issue.field.spec.userchoicefield.defaultmultivalueprovider.");+ element.addAttribute("class", clazz);+ }+ }+ }+ for (Node node: dom.selectNodes("//io.onedev.server.buildspecmodel.inputspec.userchoiceinput.defaultvalueprovider.DefaultValue")) {+ if (node instanceof Element) {+ Element element = (Element) node;+ element.setName("io.onedev.server.model.support.issue.field.spec.userchoicefield.defaultvalueprovider.DefaultValue");+ }+ }+ for (Node node: dom.selectNodes("//io.onedev.server.buildspecmodel.inputspec.userchoiceinput.defaultmultivalueprovider.DefaultMultiValue")) {+ if (node instanceof Element) {+ Element element = (Element) node;+ element.setName("io.onedev.server.model.support.issue.field.spec.userchoicefield.defaultmultivalueprovider.DefaultMultiValue");+ }+ }+ 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 0f9adff086..208d5673fb 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@@ -31,7 +31,7 @@ import io.onedev.server.model.support.issue.TransitionSpec;import io.onedev.server.model.support.issue.field.spec.BuildChoiceField;import io.onedev.server.model.support.issue.field.spec.choicefield.ChoiceField;import io.onedev.server.model.support.issue.field.spec.FieldSpec;-import io.onedev.server.model.support.issue.field.spec.UserChoiceField;+import io.onedev.server.model.support.issue.field.spec.userchoicefield.UserChoiceField;import io.onedev.server.model.support.issue.field.spec.choicefield.defaultvalueprovider.DefaultValue;import io.onedev.server.model.support.issue.field.spec.choicefield.defaultvalueprovider.SpecifiedDefaultValue;import io.onedev.server.model.support.issue.transitiontrigger.BranchUpdateTrigger;diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/BoardSpec.java b/server-core/src/main/java/io/onedev/server/model/support/issue/BoardSpec.javaindex 24bb3beb19..29066ba890 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/BoardSpec.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/BoardSpec.java@@ -30,7 +30,7 @@ import io.onedev.server.buildspecmodel.inputspec.choiceinput.choiceprovider.Specimport io.onedev.server.model.support.issue.field.spec.choicefield.ChoiceField;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.UserChoiceField;+import io.onedev.server.model.support.issue.field.spec.userchoicefield.UserChoiceField;import io.onedev.server.search.entity.issue.IssueQueryUpdater;import io.onedev.server.util.EditContext;import io.onedev.server.util.usage.Usage;diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/UserChoiceField.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/userchoicefield/UserChoiceField.javasimilarity index 59%rename from server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/UserChoiceField.javarename to server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/userchoicefield/UserChoiceField.javaindex 36f56725e8..37389bec01 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/UserChoiceField.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/userchoicefield/UserChoiceField.java@@ -1,23 +1,24 @@-package io.onedev.server.model.support.issue.field.spec;--import java.util.List;-import java.util.Map;--import javax.validation.Valid;-import javax.validation.constraints.NotNull;+package io.onedev.server.model.support.issue.field.spec.userchoicefield;+import io.onedev.server.annotation.Editable;+import io.onedev.server.annotation.ShowCondition;import io.onedev.server.buildspecmodel.inputspec.userchoiceinput.UserChoiceInput;import io.onedev.server.buildspecmodel.inputspec.userchoiceinput.choiceprovider.AllUsers;import io.onedev.server.buildspecmodel.inputspec.userchoiceinput.choiceprovider.ChoiceProvider;-import io.onedev.server.buildspecmodel.inputspec.userchoiceinput.defaultmultivalueprovider.DefaultMultiValueProvider;-import io.onedev.server.buildspecmodel.inputspec.userchoiceinput.defaultvalueprovider.DefaultValueProvider;-import io.onedev.server.buildspecmodel.inputspec.userchoiceinput.defaultvalueprovider.SpecifiedDefaultValue;+import io.onedev.server.model.support.issue.field.spec.FieldSpec;+import io.onedev.server.model.support.issue.field.spec.userchoicefield.defaultmultivalueprovider.DefaultMultiValueProvider;+import io.onedev.server.model.support.issue.field.spec.userchoicefield.defaultmultivalueprovider.SpecifiedDefaultMultiValue;+import io.onedev.server.model.support.issue.field.spec.userchoicefield.defaultvalueprovider.DefaultValueProvider;+import io.onedev.server.model.support.issue.field.spec.userchoicefield.defaultvalueprovider.SpecifiedDefaultValue;import io.onedev.server.util.EditContext;import io.onedev.server.util.usage.Usage;-import io.onedev.server.annotation.Editable;-import io.onedev.server.annotation.ShowCondition;-@Editable(order=150, name=FieldSpec.USER)+import javax.validation.Valid;+import javax.validation.constraints.NotNull;+import java.util.List;+import java.util.Map;++@Editable(order=150, name= FieldSpec.USER)public class UserChoiceField extends FieldSpec {private static final long serialVersionUID = 1L;@@ -81,21 +82,47 @@ public class UserChoiceField extends FieldSpec {return UserChoiceInput.getPropertyDef(this, indexes, choiceProvider, defaultValueProvider, defaultMultiValueProvider);}- public void onRenameUser(DefaultValueProvider defaultValueProvider, String oldName, String newName) {- if (defaultValueProvider instanceof SpecifiedDefaultValue) {+ @Override+ public void onRenameUser(String oldName, String newName) {+ if (!isAllowMultiple() && defaultValueProvider instanceof SpecifiedDefaultValue) {SpecifiedDefaultValue specifiedDefaultValue = (SpecifiedDefaultValue) defaultValueProvider;- if (specifiedDefaultValue.getValue().equals(oldName))- specifiedDefaultValue.setValue(newName);+ for (var defaultValue: specifiedDefaultValue.getDefaultValues()) {+ if (defaultValue.getValue().equals(oldName))+ defaultValue.setValue(newName);+ }+ }+ if (isAllowMultiple() && defaultMultiValueProvider instanceof SpecifiedDefaultMultiValue) {+ SpecifiedDefaultMultiValue specifiedDefaultMultiValue = (SpecifiedDefaultMultiValue) defaultMultiValueProvider;+ for (var defaultValue: specifiedDefaultMultiValue.getDefaultValues()) {+ int index = defaultValue.getValue().indexOf(oldName);+ if (index != -1)+ defaultValue.getValue().set(index, newName);+ }}}- public Usage onDeleteUser(DefaultValueProvider defaultValueProvider, String userName) {- if (defaultValueProvider instanceof SpecifiedDefaultValue) {+ @Override+ public Usage onDeleteUser(String userName) {+ Usage usage = new Usage();+ if (!isAllowMultiple() && defaultValueProvider instanceof SpecifiedDefaultValue) {SpecifiedDefaultValue specifiedDefaultValue = (SpecifiedDefaultValue) defaultValueProvider;- if (specifiedDefaultValue.getValue().equals(userName))- defaultValueProvider = null;+ int index = 0;+ for (var defaultValue: specifiedDefaultValue.getDefaultValues()) {+ if (defaultValue.getValue().equals(userName))+ usage.add("default value: item #" + index);+ index++;+ }}- return new Usage();+ if (isAllowMultiple() && defaultMultiValueProvider instanceof SpecifiedDefaultMultiValue) {+ SpecifiedDefaultMultiValue specifiedDefaultMultiValueValue = (SpecifiedDefaultMultiValue) defaultMultiValueProvider;+ int index = 0;+ for (var defaultValue: specifiedDefaultMultiValueValue.getDefaultValues()) {+ if (defaultValue.getValue().contains(userName))+ usage.add("default value: item #" + index);+ index++;+ }+ }+ return usage.prefix("custom fields: " + getName());}@Override@@ -116,5 +143,4 @@ public class UserChoiceField extends FieldSpec {getDefaultValueProvider().getDefaultValue();getChoiceProvider().getChoices(true);}-}diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/userchoicefield/defaultmultivalueprovider/DefaultMultiValue.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/userchoicefield/defaultmultivalueprovider/DefaultMultiValue.javanew file mode 100755index 0000000000..b7b19f48bb--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/userchoicefield/defaultmultivalueprovider/DefaultMultiValue.java@@ -0,0 +1,67 @@+package io.onedev.server.model.support.issue.field.spec.userchoicefield.defaultmultivalueprovider;++import io.onedev.commons.codeassist.InputSuggestion;+import io.onedev.server.OneDev;+import io.onedev.server.annotation.Editable;+import io.onedev.server.annotation.OmitName;+import io.onedev.server.annotation.Patterns;+import io.onedev.server.buildspecmodel.inputspec.userchoiceinput.choiceprovider.ChoiceProvider;+import io.onedev.server.model.User;+import io.onedev.server.util.EditContext;+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;+import java.util.stream.Collectors;++@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.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 choiceProvider.getChoices(true).stream().map(User::getName).collect(Collectors.toList());+ else+ return new ArrayList<>();+ }++}diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/userchoicefield/defaultmultivalueprovider/DefaultMultiValueProvider.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/userchoicefield/defaultmultivalueprovider/DefaultMultiValueProvider.javanew file mode 100755index 0000000000..1bb27a9936--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/userchoicefield/defaultmultivalueprovider/DefaultMultiValueProvider.java@@ -0,0 +1,8 @@+package io.onedev.server.model.support.issue.field.spec.userchoicefield.defaultmultivalueprovider;++import io.onedev.server.annotation.Editable;++@Editable+public interface DefaultMultiValueProvider extends io.onedev.server.buildspecmodel.inputspec.userchoiceinput.DefaultMultiValueProvider {++}diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/userchoicefield/defaultmultivalueprovider/ScriptingDefaultMultiValue.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/userchoicefield/defaultmultivalueprovider/ScriptingDefaultMultiValue.javanew file mode 100755index 0000000000..18bf05effe--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/userchoicefield/defaultmultivalueprovider/ScriptingDefaultMultiValue.java@@ -0,0 +1,37 @@+package io.onedev.server.model.support.issue.field.spec.userchoicefield.defaultmultivalueprovider;++import io.onedev.server.annotation.Editable;+import io.onedev.server.annotation.OmitName;+import io.onedev.server.annotation.ScriptChoice;+import io.onedev.server.util.GroovyUtils;++import javax.validation.constraints.NotEmpty;+import java.util.List;++@Editable(order=400, name="Evaluate script to get default value")+public class ScriptingDefaultMultiValue implements DefaultMultiValueProvider {++ private static final long serialVersionUID = 1L;++ private String scriptName;++ @Editable(description="Groovy script to be evaluated. It should return list of string. "+ + "Check <a href='https://docs.onedev.io/appendix/scripting' target='_blank'>scripting help</a> for details")+ @ScriptChoice+ @OmitName+ @NotEmpty+ public String getScriptName() {+ return scriptName;+ }++ public void setScriptName(String scriptName) {+ this.scriptName = scriptName;+ }++ @SuppressWarnings("unchecked")+ @Override+ public List<String> getDefaultValue() {+ return (List<String>) GroovyUtils.evalScriptByName(scriptName);+ }++}diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/userchoicefield/defaultmultivalueprovider/SpecifiedDefaultMultiValue.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/userchoicefield/defaultmultivalueprovider/SpecifiedDefaultMultiValue.javanew file mode 100755index 0000000000..dcaa6e0a10--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/userchoicefield/defaultmultivalueprovider/SpecifiedDefaultMultiValue.java@@ -0,0 +1,48 @@+package io.onedev.server.model.support.issue.field.spec.userchoicefield.defaultmultivalueprovider;++import io.onedev.server.annotation.Editable;+import io.onedev.server.annotation.OmitName;+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 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<DefaultMultiValue> defaultValues = new ArrayList<>();++ @Editable+ @Size(min=1, message="At least one entry should be specified")+ @OmitName+ public List<DefaultMultiValue> getDefaultValues() {+ return defaultValues;+ }++ public void setDefaultValues(List<DefaultMultiValue> defaultValues) {+ this.defaultValues = defaultValues;+ }++ @Override+ public List<String> getDefaultValue() {+ 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<>();+ }++}diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/userchoicefield/defaultvalueprovider/DefaultValue.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/userchoicefield/defaultvalueprovider/DefaultValue.javanew file mode 100755index 0000000000..8593efec54--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/userchoicefield/defaultvalueprovider/DefaultValue.java@@ -0,0 +1,65 @@+package io.onedev.server.model.support.issue.field.spec.userchoicefield.defaultvalueprovider;++import io.onedev.commons.codeassist.InputSuggestion;+import io.onedev.server.OneDev;+import io.onedev.server.annotation.Editable;+import io.onedev.server.annotation.Patterns;+import io.onedev.server.buildspecmodel.inputspec.userchoiceinput.choiceprovider.ChoiceProvider;+import io.onedev.server.model.User;+import io.onedev.server.util.EditContext;+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;+import java.util.stream.Collectors;++@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.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 choiceProvider.getChoices(true).stream().map(User::getName).collect(Collectors.toList());+ else+ return new ArrayList<>();+ }++}diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/userchoicefield/defaultvalueprovider/DefaultValueProvider.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/userchoicefield/defaultvalueprovider/DefaultValueProvider.javanew file mode 100755index 0000000000..da6b34d4c5--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/userchoicefield/defaultvalueprovider/DefaultValueProvider.java@@ -0,0 +1,8 @@+package io.onedev.server.model.support.issue.field.spec.userchoicefield.defaultvalueprovider;++import io.onedev.server.annotation.Editable;++@Editable+public interface DefaultValueProvider extends io.onedev.server.buildspecmodel.inputspec.userchoiceinput.DefaultValueProvider {++}diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/userchoicefield/defaultvalueprovider/ScriptingDefaultValue.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/userchoicefield/defaultvalueprovider/ScriptingDefaultValue.javanew file mode 100755index 0000000000..287c6c7bc2--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/userchoicefield/defaultvalueprovider/ScriptingDefaultValue.java@@ -0,0 +1,35 @@+package io.onedev.server.model.support.issue.field.spec.userchoicefield.defaultvalueprovider;++import io.onedev.server.annotation.Editable;+import io.onedev.server.annotation.OmitName;+import io.onedev.server.annotation.ScriptChoice;+import io.onedev.server.util.GroovyUtils;++import javax.validation.constraints.NotEmpty;++@Editable(order=400, name="Evaluate script to get default value")+public class ScriptingDefaultValue implements DefaultValueProvider {++ private static final long serialVersionUID = 1L;++ private String scriptName;++ @Editable(description="Groovy script to be evaluated. It should return a <i>string</i> value. "+ + "Check <a href='https://docs.onedev.io/appendix/scripting' target='_blank'>scripting help</a> for details")+ @ScriptChoice+ @OmitName+ @NotEmpty+ public String getScriptName() {+ return scriptName;+ }++ public void setScriptName(String scriptName) {+ this.scriptName = scriptName;+ }++ @Override+ public String getDefaultValue() {+ return (String) GroovyUtils.evalScriptByName(scriptName);+ }++}diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/userchoicefield/defaultvalueprovider/SpecifiedDefaultValue.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/userchoicefield/defaultvalueprovider/SpecifiedDefaultValue.javanew file mode 100755index 0000000000..c33af10b2f--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/userchoicefield/defaultvalueprovider/SpecifiedDefaultValue.java@@ -0,0 +1,48 @@+package io.onedev.server.model.support.issue.field.spec.userchoicefield.defaultvalueprovider;++import io.onedev.server.annotation.Editable;+import io.onedev.server.annotation.OmitName;+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 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 List<DefaultValue> defaultValues = new ArrayList<>();++ @Editable+ @Size(min=1, message="At least one entry should be specified")+ @OmitName+ public List<DefaultValue> getDefaultValues() {+ return defaultValues;+ }++ public void setDefaultValues(List<DefaultValue> defaultValues) {+ this.defaultValues = defaultValues;+ }++ @Override+ public String getDefaultValue() {+ 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;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/PressButtonTrigger.java b/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/PressButtonTrigger.javaindex d1d9ceeaf9..39b1c651f1 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/PressButtonTrigger.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/PressButtonTrigger.java@@ -23,7 +23,7 @@ import io.onedev.server.model.support.administration.GlobalIssueSetting;import io.onedev.server.buildspecmodel.inputspec.InputSpec;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.UserChoiceField;+import io.onedev.server.model.support.issue.field.spec.userchoicefield.UserChoiceField;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.usage.Usage;import io.onedev.server.web.component.issue.workflowreconcile.ReconcileUtils;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 f609293936..ba7d468f03 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@@ -40,7 +40,7 @@ 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;+import io.onedev.server.model.support.issue.field.spec.userchoicefield.UserChoiceField;import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.search.entity.EntitySort;import io.onedev.server.search.entity.EntitySort.Direction;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 07ba86fec6..3ff9ec0632 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@@ -21,6 +21,7 @@ import io.onedev.server.model.Project;import io.onedev.server.model.support.administration.GlobalIssueSetting;import io.onedev.server.model.support.issue.field.spec.*;import io.onedev.server.model.support.issue.field.spec.choicefield.ChoiceField;+import io.onedev.server.model.support.issue.field.spec.userchoicefield.UserChoiceField;import io.onedev.server.search.entity.issue.IssueQueryParseOption;import io.onedev.server.search.entity.issue.IssueQueryParser;import io.onedev.server.search.entity.project.ProjectQuery;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.javaindex f36299182a..8cc72c0fce 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java@@ -52,7 +52,7 @@ import io.onedev.server.model.support.issue.TransitionSpec;import io.onedev.server.model.support.issue.field.FieldUtils;import io.onedev.server.model.support.issue.field.spec.choicefield.ChoiceField;import io.onedev.server.model.support.issue.field.spec.FieldSpec;-import io.onedev.server.model.support.issue.field.spec.UserChoiceField;+import io.onedev.server.model.support.issue.field.spec.userchoicefield.UserChoiceField;import io.onedev.server.model.support.issue.transitiontrigger.PressButtonTrigger;import io.onedev.server.search.entity.issue.ChoiceFieldCriteria;import io.onedev.server.search.entity.issue.FieldOperatorCriteria;diff --git a/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ImportServer.java b/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ImportServer.javaindex c0db651b6a..5e26581f79 100644--- a/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ImportServer.java+++ b/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ImportServer.java@@ -18,6 +18,7 @@ import io.onedev.server.buildspecmodel.inputspec.InputSpec;import io.onedev.server.model.support.issue.StateSpec;import io.onedev.server.model.support.issue.field.spec.*;import io.onedev.server.model.support.issue.field.spec.choicefield.ChoiceField;+import io.onedev.server.model.support.issue.field.spec.userchoicefield.UserChoiceField;import io.onedev.server.persistence.dao.Dao;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.DateUtils;