The Unified and Autonomous Development Platform
Add order column to issue field
robin shen4259c31248ef
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueFieldManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueFieldManager.javaindex d0b11e8274..7fd5d77480 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueFieldManager.java+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueFieldManager.java@@ -24,9 +24,13 @@ import io.onedev.server.persistence.annotation.Sessional;import io.onedev.server.persistence.annotation.Transactional;import io.onedev.server.persistence.dao.AbstractEntityManager;import io.onedev.server.persistence.dao.Dao;+import io.onedev.server.util.EditContext;import io.onedev.server.util.MultiValueIssueField;+import io.onedev.server.util.OneContext;import io.onedev.server.util.editable.EditableUtils;+import io.onedev.server.util.inputspec.InputContext;import io.onedev.server.util.inputspec.InputSpec;+import io.onedev.server.util.inputspec.choiceinput.ChoiceInput;import io.onedev.server.web.editable.BeanDescriptor;import io.onedev.server.web.editable.PropertyDescriptor;@@ -103,12 +107,52 @@ public class DefaultIssueFieldManager extends AbstractEntityManager<IssueField>if (fieldValue != null) {InputSpec fieldSpec = issue.getProject().getIssueWorkflow().getField(propertyDescriptor.getDisplayName());if (fieldSpec != null) {+ int order;++ if (fieldSpec instanceof ChoiceInput) {+ OneContext.push(new OneContext() {++ @Override+ public Project getProject() {+ return issue.getProject();+ }++ @Override+ public EditContext getEditContext(int level) {+ return new EditContext() {++ @Override+ public Object getInputValue(String name) {+ return beanDescriptor.getMapOfDisplayNameToPropertyDescriptor().get(name).getPropertyValue(fieldBean);+ }++ };+ }++ @Override+ public InputContext getInputContext() {+ throw new UnsupportedOperationException();+ }++ });++ try {+ List<String> choices = ((ChoiceInput)fieldSpec).getChoiceProvider().getChoices(false);+ order = choices.indexOf(fieldValue);+ } finally {+ OneContext.pop();+ }+ } else {+ order = 0;+ }+for (String eachValue: fieldSpec.convertToStrings(fieldValue)) {IssueField field = new IssueField();field.setName(fieldSpec.getName());field.setIssue(issue);field.setType(EditableUtils.getDisplayName(fieldSpec.getClass()));field.setValue(eachValue);+ field.setOrder(order);save(field);}}diff --git a/core/src/main/java/io/onedev/server/model/IssueField.java b/core/src/main/java/io/onedev/server/model/IssueField.javaindex efe93cbb9a..6e0dd3b17c 100644--- a/core/src/main/java/io/onedev/server/model/IssueField.java+++ b/core/src/main/java/io/onedev/server/model/IssueField.java@@ -30,6 +30,8 @@ public class IssueField extends AbstractEntity {@Column(nullable=false)private String type;+ private int order;+public Issue getIssue() {return issue;}@@ -61,5 +63,13 @@ public class IssueField extends AbstractEntity {public void setType(String type) {this.type = type;}++ public int getOrder() {+ return order;+ }++ public void setOrder(int order) {+ this.order = order;+ }}diff --git a/core/src/main/java/io/onedev/server/model/support/issueworkflow/TransitionPrerequisite.java b/core/src/main/java/io/onedev/server/model/support/issueworkflow/TransitionPrerequisite.javaindex b3dddd5398..3f7250eaee 100644--- a/core/src/main/java/io/onedev/server/model/support/issueworkflow/TransitionPrerequisite.java+++ b/core/src/main/java/io/onedev/server/model/support/issueworkflow/TransitionPrerequisite.java@@ -47,7 +47,7 @@ public class TransitionPrerequisite implements Serializable {@SuppressWarnings("unused")private static List<String> getFieldValueChoices() {- String fieldName = (String) OneContext.get().getEditContext().getOnScreenValue("fieldName");+ String fieldName = (String) OneContext.get().getEditContext().getInputValue("fieldName");if (fieldName != null) {IssueWorkflowPage page = (IssueWorkflowPage) WicketUtils.getPage();return page.getWorkflow().getInput(fieldName).getPossibleValues();diff --git a/core/src/main/java/io/onedev/server/util/EditContext.java b/core/src/main/java/io/onedev/server/util/EditContext.javaindex abeb7c487a..585b335022 100644--- a/core/src/main/java/io/onedev/server/util/EditContext.java+++ b/core/src/main/java/io/onedev/server/util/EditContext.java@@ -2,6 +2,6 @@ package io.onedev.server.util;public interface EditContext {- Object getOnScreenValue(String name);+ Object getInputValue(String name);}diff --git a/core/src/main/java/io/onedev/server/util/OneContext.java b/core/src/main/java/io/onedev/server/util/OneContext.javaindex 6308708839..35b5351a5e 100644--- a/core/src/main/java/io/onedev/server/util/OneContext.java+++ b/core/src/main/java/io/onedev/server/util/OneContext.java@@ -4,17 +4,12 @@ import java.util.Stack;import javax.annotation.Nullable;-import org.apache.wicket.Component;-import org.apache.wicket.Page;-import io.onedev.launcher.loader.AppLoader;import io.onedev.server.OneDev;import io.onedev.server.model.Project;import io.onedev.server.util.inputspec.InputContext;-import io.onedev.server.web.page.project.ProjectPage;-import io.onedev.server.web.util.WicketUtils;-public class OneContext {+public abstract class OneContext {private static ThreadLocal<Stack<OneContext>> stack = new ThreadLocal<Stack<OneContext>>() {@@ -41,12 +36,6 @@ public class OneContext {return null;}- private final Component component;-- public OneContext(Component component) {- this.component = component;- }-public <T> T getInstance(Class<T> type) {return AppLoader.getInstance(type);}@@ -59,24 +48,10 @@ public class OneContext {return getEditContext(0);}- public Project getProject() {- Page page = component.getPage();- if (page instanceof ProjectPage)- return ((ProjectPage)page).getProject();- else- return null;- }+ public abstract Project getProject();- public EditContext getEditContext(int level) {- return WicketUtils.findParents(component, EditContext.class).get(level);- }+ public abstract EditContext getEditContext(int level);- public InputContext getInputContext() {- return WicketUtils.findInnermost(component, InputContext.class);- }-- public Component getComponent() {- return component;- }+ public abstract InputContext getInputContext();}diff --git a/core/src/main/java/io/onedev/server/util/inputspec/InputSpec.java b/core/src/main/java/io/onedev/server/util/inputspec/InputSpec.javaindex 40be3da014..8247d68004 100644--- a/core/src/main/java/io/onedev/server/util/inputspec/InputSpec.java+++ b/core/src/main/java/io/onedev/server/util/inputspec/InputSpec.java@@ -115,7 +115,7 @@ public abstract class InputSpec implements Serializable {@SuppressWarnings("unused")private static boolean isNameOfEmptyValueVisible() {- return (boolean) OneContext.get().getEditContext().getOnScreenValue("allowEmpty");+ return (boolean) OneContext.get().getEditContext().getInputValue("allowEmpty");}public List<String> getPossibleValues() {diff --git a/core/src/main/java/io/onedev/server/util/inputspec/choiceinput/defaultvalueprovider/SpecifiedDefaultValue.java b/core/src/main/java/io/onedev/server/util/inputspec/choiceinput/defaultvalueprovider/SpecifiedDefaultValue.javaindex 83616d5e18..a16bda303a 100644--- a/core/src/main/java/io/onedev/server/util/inputspec/choiceinput/defaultvalueprovider/SpecifiedDefaultValue.java+++ b/core/src/main/java/io/onedev/server/util/inputspec/choiceinput/defaultvalueprovider/SpecifiedDefaultValue.java@@ -40,7 +40,7 @@ public class SpecifiedDefaultValue implements DefaultValueProvider {@SuppressWarnings("unused")private static List<String> getValueChoices() {- ChoiceProvider choiceProvider = (ChoiceProvider) OneContext.get().getEditContext(1).getOnScreenValue("choiceProvider");+ ChoiceProvider choiceProvider = (ChoiceProvider) OneContext.get().getEditContext(1).getInputValue("choiceProvider");if (choiceProvider != null && OneDev.getInstance(Validator.class).validate(choiceProvider).isEmpty())return choiceProvider.getChoices(true);elsediff --git a/core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/defaultvalueprovider/SpecifiedDefaultValue.java b/core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/defaultvalueprovider/SpecifiedDefaultValue.javaindex 229ddcbdd9..501f5046af 100644--- a/core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/defaultvalueprovider/SpecifiedDefaultValue.java+++ b/core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/defaultvalueprovider/SpecifiedDefaultValue.java@@ -42,7 +42,7 @@ public class SpecifiedDefaultValue implements DefaultValueProvider {@SuppressWarnings("unused")private static List<GroupFacade> getValueChoices() {- ChoiceProvider choiceProvider = (ChoiceProvider) OneContext.get().getEditContext(1).getOnScreenValue("choiceProvider");+ ChoiceProvider choiceProvider = (ChoiceProvider) OneContext.get().getEditContext(1).getInputValue("choiceProvider");if (choiceProvider != null && OneDev.getInstance(Validator.class).validate(choiceProvider).isEmpty())return choiceProvider.getChoices(true);elsediff --git a/core/src/main/java/io/onedev/server/util/inputspec/groupmultichoiceinput/defaultvalueprovider/SpecifiedDefaultValue.java b/core/src/main/java/io/onedev/server/util/inputspec/groupmultichoiceinput/defaultvalueprovider/SpecifiedDefaultValue.javaindex 5402383b57..6b15f12310 100644--- a/core/src/main/java/io/onedev/server/util/inputspec/groupmultichoiceinput/defaultvalueprovider/SpecifiedDefaultValue.java+++ b/core/src/main/java/io/onedev/server/util/inputspec/groupmultichoiceinput/defaultvalueprovider/SpecifiedDefaultValue.java@@ -42,7 +42,7 @@ public class SpecifiedDefaultValue implements DefaultValueProvider {@SuppressWarnings("unused")private static List<GroupFacade> getValueChoices() {- ChoiceProvider choiceProvider = (ChoiceProvider) OneContext.get().getEditContext(1).getOnScreenValue("choiceProvider");+ ChoiceProvider choiceProvider = (ChoiceProvider) OneContext.get().getEditContext(1).getInputValue("choiceProvider");if (choiceProvider != null && OneDev.getInstance(Validator.class).validate(choiceProvider).isEmpty())return choiceProvider.getChoices(true);elsediff --git a/core/src/main/java/io/onedev/server/util/inputspec/multichoiceinput/defaultvalueprovider/SpecifiedDefaultValue.java b/core/src/main/java/io/onedev/server/util/inputspec/multichoiceinput/defaultvalueprovider/SpecifiedDefaultValue.javaindex 7de731545c..6e1656d3bb 100644--- a/core/src/main/java/io/onedev/server/util/inputspec/multichoiceinput/defaultvalueprovider/SpecifiedDefaultValue.java+++ b/core/src/main/java/io/onedev/server/util/inputspec/multichoiceinput/defaultvalueprovider/SpecifiedDefaultValue.java@@ -40,7 +40,7 @@ public class SpecifiedDefaultValue implements DefaultValueProvider {@SuppressWarnings("unused")private static List<String> getValueChoices() {- ChoiceProvider choiceProvider = (ChoiceProvider) OneContext.get().getEditContext(1).getOnScreenValue("choiceProvider");+ ChoiceProvider choiceProvider = (ChoiceProvider) OneContext.get().getEditContext(1).getInputValue("choiceProvider");if (choiceProvider != null && OneDev.getInstance(Validator.class).validate(choiceProvider).isEmpty())return choiceProvider.getChoices(true);elsediff --git a/core/src/main/java/io/onedev/server/util/inputspec/showcondition/ShowCondition.java b/core/src/main/java/io/onedev/server/util/inputspec/showcondition/ShowCondition.javaindex c29cb4b9f2..b91fefd28e 100644--- a/core/src/main/java/io/onedev/server/util/inputspec/showcondition/ShowCondition.java+++ b/core/src/main/java/io/onedev/server/util/inputspec/showcondition/ShowCondition.java@@ -52,7 +52,7 @@ public class ShowCondition implements Serializable {public boolean isVisible() {InputSpec input = OneContext.get().getInputContext().getInput(getInputName());- Object inputValue = OneContext.get().getEditContext().getOnScreenValue(getInputName());+ Object inputValue = OneContext.get().getEditContext().getInputValue(getInputName());if (inputValue != null) {List<String> strings = input.convertToStrings(inputValue);if (strings.isEmpty())diff --git a/core/src/main/java/io/onedev/server/util/inputspec/showcondition/ValueIsNotAnyOf.java b/core/src/main/java/io/onedev/server/util/inputspec/showcondition/ValueIsNotAnyOf.javaindex 6f41db2043..188c3cf159 100644--- a/core/src/main/java/io/onedev/server/util/inputspec/showcondition/ValueIsNotAnyOf.java+++ b/core/src/main/java/io/onedev/server/util/inputspec/showcondition/ValueIsNotAnyOf.java@@ -33,7 +33,7 @@ public class ValueIsNotAnyOf implements ValueMatcher {@SuppressWarnings("unused")private static List<String> getValueChoices() {// Access on-screen value of ShowCondition.fiedName- String inputName = (String) OneContext.get().getEditContext(1).getOnScreenValue("inputName");+ String inputName = (String) OneContext.get().getEditContext(1).getInputValue("inputName");if (inputName != null)return OneContext.get().getInputContext().getInput(inputName).getPossibleValues();elsediff --git a/core/src/main/java/io/onedev/server/util/inputspec/showcondition/ValueIsOneOf.java b/core/src/main/java/io/onedev/server/util/inputspec/showcondition/ValueIsOneOf.javaindex e80ce76804..3cb2ee065c 100644--- a/core/src/main/java/io/onedev/server/util/inputspec/showcondition/ValueIsOneOf.java+++ b/core/src/main/java/io/onedev/server/util/inputspec/showcondition/ValueIsOneOf.java@@ -33,7 +33,7 @@ public class ValueIsOneOf implements ValueMatcher {@SuppressWarnings("unused")private static List<String> getValueChoices() {// Access on-screen value of ShowCondition.fiedName- String inputName = (String) OneContext.get().getEditContext(1).getOnScreenValue("inputName");+ String inputName = (String) OneContext.get().getEditContext(1).getInputValue("inputName");if (inputName != null)return OneContext.get().getInputContext().getInput(inputName).getPossibleValues();elsediff --git a/core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/defaultvalueprovider/SpecifiedDefaultValue.java b/core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/defaultvalueprovider/SpecifiedDefaultValue.javaindex 91c066babb..90c43f4007 100644--- a/core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/defaultvalueprovider/SpecifiedDefaultValue.java+++ b/core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/defaultvalueprovider/SpecifiedDefaultValue.java@@ -42,7 +42,7 @@ public class SpecifiedDefaultValue implements DefaultValueProvider {@SuppressWarnings("unused")private static List<UserFacade> getValueChoices() {- ChoiceProvider choiceProvider = (ChoiceProvider) OneContext.get().getEditContext(1).getOnScreenValue("choiceProvider");+ ChoiceProvider choiceProvider = (ChoiceProvider) OneContext.get().getEditContext(1).getInputValue("choiceProvider");if (choiceProvider != null && OneDev.getInstance(Validator.class).validate(choiceProvider).isEmpty())return choiceProvider.getChoices(true);elsediff --git a/core/src/main/java/io/onedev/server/util/inputspec/usermultichoiceinput/defaultvalueprovider/SpecifiedDefaultValue.java b/core/src/main/java/io/onedev/server/util/inputspec/usermultichoiceinput/defaultvalueprovider/SpecifiedDefaultValue.javaindex d9ecbaec60..c742e7554b 100644--- a/core/src/main/java/io/onedev/server/util/inputspec/usermultichoiceinput/defaultvalueprovider/SpecifiedDefaultValue.java+++ b/core/src/main/java/io/onedev/server/util/inputspec/usermultichoiceinput/defaultvalueprovider/SpecifiedDefaultValue.java@@ -42,7 +42,7 @@ public class SpecifiedDefaultValue implements DefaultValueProvider {@SuppressWarnings("unused")private static List<UserFacade> getValueChoices() {- ChoiceProvider choiceProvider = (ChoiceProvider) OneContext.get().getEditContext(1).getOnScreenValue("choiceProvider");+ ChoiceProvider choiceProvider = (ChoiceProvider) OneContext.get().getEditContext(1).getInputValue("choiceProvider");if (choiceProvider != null && OneDev.getInstance(Validator.class).validate(choiceProvider).isEmpty())return choiceProvider.getChoices(true);elsediff --git a/core/src/main/java/io/onedev/server/web/component/colorpicker/color-picker.css b/core/src/main/java/io/onedev/server/web/component/colorpicker/color-picker.cssindex 2011d6256f..71b1a4c380 100644--- a/core/src/main/java/io/onedev/server/web/component/colorpicker/color-picker.css+++ b/core/src/main/java/io/onedev/server/web/component/colorpicker/color-picker.css@@ -1,4 +1,4 @@.sp-replacer {border-radius: 4px;padding: 5px;-}\ No newline at end of file+}diff --git a/core/src/main/java/io/onedev/server/web/editable/BeanEditor.java b/core/src/main/java/io/onedev/server/web/editable/BeanEditor.javaindex 40273107f8..a9813678c4 100644--- a/core/src/main/java/io/onedev/server/web/editable/BeanEditor.java+++ b/core/src/main/java/io/onedev/server/web/editable/BeanEditor.java@@ -40,6 +40,7 @@ import io.onedev.server.util.editable.annotation.Vertical;import io.onedev.server.web.editable.PathSegment.Property;import io.onedev.server.web.editable.bean.BeanPropertyEditor;import io.onedev.server.web.editable.polymorphic.PolymorphicPropertyEditor;+import io.onedev.server.web.util.ComponentContext;import io.onedev.utils.ReflectionUtils;import io.onedev.utils.StringUtils;@@ -166,7 +167,7 @@ public class BeanEditor extends ValueEditor<Serializable> {Serializable propertyValue;- OneContext context = new OneContext(this);+ OneContext context = new ComponentContext(this);OneContext.push(context);try {@@ -230,7 +231,7 @@ public class BeanEditor extends ValueEditor<Serializable> {}@Override- public Object getOnScreenValue(String name) {+ public Object getInputValue(String name) {/** Field will be be display name of the property when the bean class being edited is* generated via groovy scriptdiff --git a/core/src/main/java/io/onedev/server/web/editable/BeanViewer.java b/core/src/main/java/io/onedev/server/web/editable/BeanViewer.javaindex 9c75642554..e514182251 100644--- a/core/src/main/java/io/onedev/server/web/editable/BeanViewer.java+++ b/core/src/main/java/io/onedev/server/web/editable/BeanViewer.java@@ -86,7 +86,7 @@ public class BeanViewer extends Panel implements PropertyContextAware, EditConte}@Override- public Object getOnScreenValue(String name) {+ public Object getInputValue(String name) {String propertyName = beanDescriptor.getPropertyName(name);return getPropertyContext(propertyName).getPropertyValue(getDefaultModelObject());}diff --git a/core/src/main/java/io/onedev/server/web/editable/PropertyDescriptor.java b/core/src/main/java/io/onedev/server/web/editable/PropertyDescriptor.javaindex 8f65d83b8e..0f9f98f051 100644--- a/core/src/main/java/io/onedev/server/web/editable/PropertyDescriptor.java+++ b/core/src/main/java/io/onedev/server/web/editable/PropertyDescriptor.java@@ -18,6 +18,7 @@ import io.onedev.server.util.JsoupUtils;import io.onedev.server.util.OneContext;import io.onedev.server.util.editable.EditableUtils;import io.onedev.server.util.editable.annotation.ShowCondition;+import io.onedev.server.web.util.ComponentContext;import io.onedev.utils.BeanUtils;import io.onedev.utils.ReflectionUtils;@@ -121,7 +122,7 @@ public class PropertyDescriptor implements Serializable {return true;checkedPropertyNames.add(getPropertyName());- OneContext.push(new OneContext((Component) propertyContextAware));+ OneContext.push(new ComponentContext((Component) propertyContextAware));try {ShowCondition showCondition = getPropertyGetter().getAnnotation(ShowCondition.class);if (showCondition != null && !(boolean)ReflectionUtils.invokeStaticMethod(getBeanClass(), showCondition.value()))@@ -157,7 +158,7 @@ public class PropertyDescriptor implements Serializable {public String getDescription(Component component) {String description = getDescription();if (description != null) {- OneContext.push(new OneContext(component));+ OneContext.push(new ComponentContext(component));try {description = Application.get().getResourceSettings().getLocalizer().getString(description, component, description);description = GroovyUtils.evalGString(description);diff --git a/core/src/main/java/io/onedev/server/web/editable/PropertyEditor.java b/core/src/main/java/io/onedev/server/web/editable/PropertyEditor.javaindex bb89f5b377..abc7de6d19 100644--- a/core/src/main/java/io/onedev/server/web/editable/PropertyEditor.java+++ b/core/src/main/java/io/onedev/server/web/editable/PropertyEditor.java@@ -53,7 +53,7 @@ public abstract class PropertyEditor<T> extends ValueEditor<T> {@Overrideprotected String load() {- String classes = "property editor editable ";+ String classes = " property editor editable ";if (hasErrors(true) && getErrorClass() != null)classes += getErrorClass();return classes;diff --git a/core/src/main/java/io/onedev/server/web/editable/choice/MultiChoiceEditor.java b/core/src/main/java/io/onedev/server/web/editable/choice/MultiChoiceEditor.javaindex e6136f9b9b..3c69170789 100644--- a/core/src/main/java/io/onedev/server/web/editable/choice/MultiChoiceEditor.java+++ b/core/src/main/java/io/onedev/server/web/editable/choice/MultiChoiceEditor.java@@ -24,6 +24,7 @@ import io.onedev.server.web.editable.ErrorContext;import io.onedev.server.web.editable.PathSegment;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;+import io.onedev.server.web.util.ComponentContext;import io.onedev.utils.ReflectionUtils;@SuppressWarnings("serial")@@ -42,7 +43,7 @@ public class MultiChoiceEditor extends PropertyEditor<List<String>> {protected void onInitialize() {super.onInitialize();- OneContext oneContext = new OneContext(this);+ OneContext oneContext = new ComponentContext(this);OneContext.push(oneContext);try {diff --git a/core/src/main/java/io/onedev/server/web/editable/choice/SingleChoiceEditor.java b/core/src/main/java/io/onedev/server/web/editable/choice/SingleChoiceEditor.javaindex bc4ffa5b20..d87ba17642 100644--- a/core/src/main/java/io/onedev/server/web/editable/choice/SingleChoiceEditor.java+++ b/core/src/main/java/io/onedev/server/web/editable/choice/SingleChoiceEditor.java@@ -23,6 +23,7 @@ import io.onedev.server.web.editable.ErrorContext;import io.onedev.server.web.editable.PathSegment;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;+import io.onedev.server.web.util.ComponentContext;import io.onedev.utils.ReflectionUtils;@SuppressWarnings("serial")@@ -41,7 +42,7 @@ public class SingleChoiceEditor extends PropertyEditor<String> {protected void onInitialize() {super.onInitialize();- OneContext oneContext = new OneContext(this);+ OneContext oneContext = new ComponentContext(this);OneContext.push(oneContext);try {diff --git a/core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupMultiChoiceEditor.java b/core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupMultiChoiceEditor.javaindex 95c309a600..c082a78936 100644--- a/core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupMultiChoiceEditor.java+++ b/core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupMultiChoiceEditor.java@@ -26,6 +26,7 @@ import io.onedev.server.web.editable.ErrorContext;import io.onedev.server.web.editable.PathSegment;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;+import io.onedev.server.web.util.ComponentContext;import io.onedev.utils.ReflectionUtils;@SuppressWarnings("serial")@@ -44,7 +45,7 @@ public class GroupMultiChoiceEditor extends PropertyEditor<Collection<String>> {protected void onInitialize() {super.onInitialize();- OneContext oneContext = new OneContext(this);+ OneContext oneContext = new ComponentContext(this);OneContext.push(oneContext);try {diff --git a/core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupSingleChoiceEditor.java b/core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupSingleChoiceEditor.javaindex 44dcb1da18..9118ebc222 100644--- a/core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupSingleChoiceEditor.java+++ b/core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupSingleChoiceEditor.java@@ -24,6 +24,7 @@ import io.onedev.server.web.editable.ErrorContext;import io.onedev.server.web.editable.PathSegment;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;+import io.onedev.server.web.util.ComponentContext;import io.onedev.utils.ReflectionUtils;@SuppressWarnings("serial")@@ -42,7 +43,7 @@ public class GroupSingleChoiceEditor extends PropertyEditor<String> {protected void onInitialize() {super.onInitialize();- OneContext oneContext = new OneContext(this);+ OneContext oneContext = new ComponentContext(this);OneContext.push(oneContext);try {diff --git a/core/src/main/java/io/onedev/server/web/editable/userchoice/UserMultiChoiceEditor.java b/core/src/main/java/io/onedev/server/web/editable/userchoice/UserMultiChoiceEditor.javaindex 4f1ce7ab6a..b42d6e31f9 100644--- a/core/src/main/java/io/onedev/server/web/editable/userchoice/UserMultiChoiceEditor.java+++ b/core/src/main/java/io/onedev/server/web/editable/userchoice/UserMultiChoiceEditor.java@@ -26,6 +26,7 @@ import io.onedev.server.web.editable.ErrorContext;import io.onedev.server.web.editable.PathSegment;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;+import io.onedev.server.web.util.ComponentContext;import io.onedev.utils.ReflectionUtils;@SuppressWarnings("serial")@@ -45,7 +46,7 @@ public class UserMultiChoiceEditor extends PropertyEditor<List<String>> {protected void onInitialize() {super.onInitialize();- OneContext oneContext = new OneContext(this);+ OneContext oneContext = new ComponentContext(this);OneContext.push(oneContext);try {diff --git a/core/src/main/java/io/onedev/server/web/editable/userchoice/UserSingleChoiceEditor.java b/core/src/main/java/io/onedev/server/web/editable/userchoice/UserSingleChoiceEditor.javaindex f8fe39628d..9745d65c00 100644--- a/core/src/main/java/io/onedev/server/web/editable/userchoice/UserSingleChoiceEditor.java+++ b/core/src/main/java/io/onedev/server/web/editable/userchoice/UserSingleChoiceEditor.java@@ -24,6 +24,7 @@ import io.onedev.server.web.editable.ErrorContext;import io.onedev.server.web.editable.PathSegment;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;+import io.onedev.server.web.util.ComponentContext;import io.onedev.utils.ReflectionUtils;@SuppressWarnings("serial")@@ -43,7 +44,7 @@ public class UserSingleChoiceEditor extends PropertyEditor<String> {protected void onInitialize() {super.onInitialize();- OneContext oneContext = new OneContext(this);+ OneContext oneContext = new ComponentContext(this);OneContext.push(oneContext);try {diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/FieldFixOption.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/FieldFixOption.javaindex 511eac1aa3..4a24b6b6db 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/FieldFixOption.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/FieldFixOption.java@@ -16,6 +16,7 @@ import io.onedev.server.util.editable.annotation.Editable;import io.onedev.server.util.editable.annotation.ShowCondition;import io.onedev.server.util.inputspec.InputSpec;import io.onedev.server.web.page.project.ProjectPage;+import io.onedev.server.web.util.ComponentContext;import io.onedev.server.web.util.WicketUtils;@Editable@@ -66,12 +67,12 @@ public class FieldFixOption implements Serializable {@SuppressWarnings("unused")private static boolean isNewFieldVisible() {- return OneContext.get().getEditContext().getOnScreenValue("fixType") == FixType.CHANGE_TO_ANOTHER_FIELD;+ return OneContext.get().getEditContext().getInputValue("fixType") == FixType.CHANGE_TO_ANOTHER_FIELD;}@SuppressWarnings("unused")private static List<String> getFieldChoices() {- MultiValueIssueField fixField = OneContext.get().getComponent().findParent(FieldFixPanel.class).getInvalidField();+ MultiValueIssueField fixField = ((ComponentContext)OneContext.get()).getComponent().findParent(FieldFixPanel.class).getInvalidField();ProjectPage page = (ProjectPage) WicketUtils.getPage();List<String> fields = new ArrayList<>();for (InputSpec field: page.getProject().getIssueWorkflow().getFields()) {diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/FieldValueFixOption.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/FieldValueFixOption.javaindex 4c6fbcf2fb..e4b70797c7 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/FieldValueFixOption.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/FieldValueFixOption.java@@ -17,6 +17,7 @@ import io.onedev.server.util.editable.annotation.ShowCondition;import io.onedev.server.util.inputspec.InputSpec;import io.onedev.server.util.inputspec.choiceinput.ChoiceInput;import io.onedev.server.util.inputspec.multichoiceinput.MultiChoiceInput;+import io.onedev.server.web.util.ComponentContext;@Editablepublic class FieldValueFixOption implements Serializable {@@ -65,13 +66,13 @@ public class FieldValueFixOption implements Serializable {@SuppressWarnings("unused")private static boolean isNewValueVisible() {- return OneContext.get().getEditContext().getOnScreenValue("fixType") == FixType.CHANGE_TO_ANOTHER_VALUE;+ return OneContext.get().getEditContext().getInputValue("fixType") == FixType.CHANGE_TO_ANOTHER_VALUE;}@SuppressWarnings("unused")private static List<String> getValueChoices() {- FieldValueFixPanel fieldValueFixPanel = OneContext.get().getComponent().findParent(FieldValueFixPanel.class);- OneContext.push(new OneContext(fieldValueFixPanel));+ FieldValueFixPanel fieldValueFixPanel = ((ComponentContext)OneContext.get()).getComponent().findParent(FieldValueFixPanel.class);+ OneContext.push(new ComponentContext(fieldValueFixPanel));try {MultiValueIssueField fixField = fieldValueFixPanel.getField();InputSpec fieldSpec = Preconditions.checkNotNull(OneContext.get().getProject().getIssueWorkflow().getField(fixField.getName()));diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.javaindex 7f3be3747a..6eed7013a7 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.java@@ -68,6 +68,7 @@ import io.onedev.server.web.page.project.ProjectPage;import io.onedev.server.web.page.project.issues.issueedit.IssueEditPage;import io.onedev.server.web.page.project.issues.issuelist.IssueListPage;import io.onedev.server.web.page.project.issues.newissue.NewIssuePage;+import io.onedev.server.web.util.ComponentContext;import io.onedev.server.web.util.ConfirmOnClick;import io.onedev.server.web.util.DateUtils;@@ -386,8 +387,8 @@ public class IssueDetailPage extends ProjectPage implements InputContext {}@Override- public Object getOnScreenValue(String name) {- return valueContainer.getOnScreenValue(name);+ public Object getInputValue(String name) {+ return valueContainer.getInputValue(name);}};@@ -397,7 +398,7 @@ public class IssueDetailPage extends ProjectPage implements InputContext {protected void onConfigure() {super.onConfigure();- OneContext.push(new OneContext(this));+ OneContext.push(new ComponentContext(this));try {MultiValueIssueField field = item.getModelObject();InputSpec fieldSpec = getProject().getIssueWorkflow().getField(field.getName());@@ -490,7 +491,7 @@ public class IssueDetailPage extends ProjectPage implements InputContext {}@Override- public Object getOnScreenValue(String name) {+ public Object getInputValue(String name) {MultiValueIssueField field = getIssue().getMultiValueFields().get(name);InputSpec fieldSpec = getIssue().getProject().getIssueWorkflow().getField(field.getName());if (field != null && fieldSpec != null && field.getType().equals(EditableUtils.getDisplayName(fieldSpec.getClass()))) {diff --git a/core/src/main/java/io/onedev/server/web/util/ComponentContext.java b/core/src/main/java/io/onedev/server/web/util/ComponentContext.javanew file mode 100644index 0000000000..efa218c253--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/util/ComponentContext.java@@ -0,0 +1,43 @@+package io.onedev.server.web.util;++import org.apache.wicket.Component;+import org.apache.wicket.Page;++import io.onedev.server.model.Project;+import io.onedev.server.util.EditContext;+import io.onedev.server.util.OneContext;+import io.onedev.server.util.inputspec.InputContext;+import io.onedev.server.web.page.project.ProjectPage;++public class ComponentContext extends OneContext {++ private final Component component;++ public ComponentContext(Component component) {+ this.component = component;+ }++ @Override+ public Project getProject() {+ Page page = component.getPage();+ if (page instanceof ProjectPage)+ return ((ProjectPage)page).getProject();+ else+ return null;+ }++ @Override+ public EditContext getEditContext(int level) {+ return WicketUtils.findParents(component, EditContext.class).get(level);+ }++ @Override+ public InputContext getInputContext() {+ return WicketUtils.findInnermost(component, InputContext.class);+ }++ public Component getComponent() {+ return component;+ }++}