Skip to content

The Unified and Autonomous Development Platform

Write permission support for issue custom field

Robin Shenb51fa3441ad1
diff --git a/core/src/main/java/io/onedev/server/model/support/usermatcher/SpecifiedGroup.java b/core/src/main/java/io/onedev/server/model/support/usermatcher/SpecifiedGroup.java
index 82b6a6565f..0eabffa1c3 100644
--- a/core/src/main/java/io/onedev/server/model/support/usermatcher/SpecifiedGroup.java
+++ b/core/src/main/java/io/onedev/server/model/support/usermatcher/SpecifiedGroup.java
@@ -13,7 +13,7 @@ import io.onedev.server.web.editable.annotation.Editable;
import io.onedev.server.web.editable.annotation.GroupChoice;
import io.onedev.server.web.editable.annotation.OmitName;
-@Editable(order=300, name="Specified group")
+@Editable(order=600, name="Specified group")
public class SpecifiedGroup implements UserMatcher {
private static final long serialVersionUID = 1L;
diff --git a/core/src/main/java/io/onedev/server/util/IssueUtils.java b/core/src/main/java/io/onedev/server/util/IssueUtils.java
index d17a894d47..41f2e6c892 100644
--- a/core/src/main/java/io/onedev/server/util/IssueUtils.java
+++ b/core/src/main/java/io/onedev/server/util/IssueUtils.java
@@ -22,7 +22,9 @@ import io.onedev.server.OneDev;
import io.onedev.server.manager.ProjectManager;
import io.onedev.server.manager.SettingManager;
import io.onedev.server.model.Project;
+import io.onedev.server.model.User;
import io.onedev.server.model.support.setting.GlobalIssueSetting;
+import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.inputspec.InputSpec;
import io.onedev.server.web.editable.BeanDescriptor;
import io.onedev.server.web.editable.PropertyDescriptor;
@@ -56,24 +58,35 @@ public class IssueUtils {
}
}
- public static Collection<String> getPropertyNames(Class<?> fieldBeanClass, Collection<String> fieldNames) {
+ public static Collection<String> getPropertyNames(Project project, Class<?> fieldBeanClass,
+ Collection<String> fieldNames) {
Collection<String> propertyNames = new HashSet<>();
+ SettingManager settingManager = OneDev.getInstance(SettingManager.class);
+ User user = SecurityUtils.getUser();
for (PropertyDescriptor property: new BeanDescriptor(fieldBeanClass).getPropertyDescriptors()) {
- if (fieldNames.contains(property.getDisplayName()))
- propertyNames.add(property.getPropertyName());
+ if (fieldNames.contains(property.getDisplayName())) {
+ InputSpec field = settingManager.getIssueSetting().getFieldSpec(property.getDisplayName());
+ if (field != null && field.getAllowedWriters().matches(project, user))
+ propertyNames.add(property.getPropertyName());
+ }
}
return propertyNames;
}
- public static Map<String, Object> getFieldValues(Serializable fieldBean, Collection<String> fieldNames) {
- Map<String, Object> fieldValues = new HashMap<>();
- BeanDescriptor beanDescriptor = new BeanDescriptor(fieldBean.getClass());
- for (PropertyDescriptor propertyDescriptor: beanDescriptor.getPropertyDescriptors()) {
- if (fieldNames.contains(propertyDescriptor.getDisplayName()))
- fieldValues.put(propertyDescriptor.getDisplayName(), propertyDescriptor.getPropertyValue(fieldBean));
+ public static Map<String, Object> getFieldValues(OneContext context, Serializable fieldBean, Collection<String> fieldNames) {
+ OneContext.push(context);
+ try {
+ Map<String, Object> fieldValues = new HashMap<>();
+ BeanDescriptor beanDescriptor = new BeanDescriptor(fieldBean.getClass());
+ for (PropertyDescriptor propertyDescriptor: beanDescriptor.getPropertyDescriptors()) {
+ if (fieldNames.contains(propertyDescriptor.getDisplayName()))
+ fieldValues.put(propertyDescriptor.getDisplayName(), propertyDescriptor.getPropertyValue(fieldBean));
+ }
+
+ return fieldValues;
+ } finally {
+ OneContext.pop();
}
-
- return fieldValues;
}
public static Collection<Long> parseFixedIssues(Project project, String commitMessage) {
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.java
index 73ef99aaec..f2b75f6af6 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
@@ -6,6 +6,7 @@ import java.util.List;
import java.util.Map;
import javax.annotation.Nullable;
+import javax.validation.constraints.NotNull;
import org.apache.commons.lang.SerializationUtils;
import org.hibernate.validator.constraints.NotEmpty;
@@ -15,6 +16,8 @@ import org.unbescape.java.JavaEscape;
import com.google.common.collect.Lists;
+import io.onedev.server.model.support.usermatcher.Anyone;
+import io.onedev.server.model.support.usermatcher.UserMatcher;
import io.onedev.server.util.GroovyUtils;
import io.onedev.server.util.OneContext;
import io.onedev.server.util.ValueSetEdit;
@@ -70,6 +73,8 @@ public abstract class InputSpec implements Serializable {
private ShowCondition showCondition;
+ private UserMatcher allowedWriters = new Anyone();
+
@Editable(order=10)
@InputName
@NotEmpty
@@ -131,6 +136,16 @@ public abstract class InputSpec implements Serializable {
this.nameOfEmptyValue = nameOfEmptyValue;
}
+ @Editable(order=65, name="Can Be Changed By", description="resource.input.allowedWriters")
+ @NotNull
+ public UserMatcher getAllowedWriters() {
+ return allowedWriters;
+ }
+
+ public void setAllowedWriters(UserMatcher allowedWriters) {
+ this.allowedWriters = allowedWriters;
+ }
+
@SuppressWarnings("unused")
private static boolean isNameOfEmptyValueVisible() {
return (boolean) OneContext.get().getEditContext().getInputValue("allowEmpty");
diff --git a/core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/UserChoiceInput.java b/core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/UserChoiceInput.java
index a862050059..5ac63fea52 100644
--- a/core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/UserChoiceInput.java
+++ b/core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/UserChoiceInput.java
@@ -1,18 +1,17 @@
package io.onedev.server.util.inputspec.userchoiceinput;
-import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
-import javax.validation.Validator;
import javax.validation.constraints.NotNull;
import io.onedev.server.OneDev;
-import io.onedev.server.util.facade.UserFacade;
+import io.onedev.server.manager.UserManager;
import io.onedev.server.util.inputspec.InputSpec;
import io.onedev.server.util.inputspec.userchoiceinput.choiceprovider.ChoiceProvider;
-import io.onedev.server.util.inputspec.userchoiceinput.choiceprovider.IssueReaders;
import io.onedev.server.util.inputspec.userchoiceinput.choiceprovider.GroupUsers;
+import io.onedev.server.util.inputspec.userchoiceinput.choiceprovider.IssueReaders;
import io.onedev.server.util.inputspec.userchoiceinput.defaultvalueprovider.DefaultValueProvider;
import io.onedev.server.util.inputspec.userchoiceinput.defaultvalueprovider.SpecifiedDefaultValue;
import io.onedev.server.web.editable.annotation.Editable;
@@ -50,12 +49,7 @@ public class UserChoiceInput extends InputSpec {
@Override
public List<String> getPossibleValues() {
- List<String> possibleValues = new ArrayList<>();
- if (OneDev.getInstance(Validator.class).validate(getChoiceProvider()).isEmpty()) {
- for (UserFacade user: getChoiceProvider().getChoices(true))
- possibleValues.add(user.getName());
- }
- return possibleValues;
+ return OneDev.getInstance(UserManager.class).query().stream().map(user->user.getName()).collect(Collectors.toList());
}
@Override
diff --git a/core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/CodeReaders.java b/core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/CodeReaders.java
index f3dfe31315..450a66ac3d 100644
--- a/core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/CodeReaders.java
+++ b/core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/CodeReaders.java
@@ -10,7 +10,7 @@ import io.onedev.server.util.OneContext;
import io.onedev.server.util.facade.UserFacade;
import io.onedev.server.web.editable.annotation.Editable;
-@Editable(order=130, name="Users with code read privilege")
+@Editable(order=130, name="Users allowed to read code")
public class CodeReaders implements ChoiceProvider {
private static final long serialVersionUID = 1L;
diff --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.java
index a98dc8d6df..19732178e6 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
@@ -1,17 +1,13 @@
package io.onedev.server.util.inputspec.userchoiceinput.defaultvalueprovider;
import java.util.List;
-
-import javax.validation.Validator;
+import java.util.stream.Collectors;
import org.hibernate.validator.constraints.NotEmpty;
-import com.google.common.collect.Lists;
-
import io.onedev.server.OneDev;
-import io.onedev.server.util.OneContext;
+import io.onedev.server.manager.UserManager;
import io.onedev.server.util.facade.UserFacade;
-import io.onedev.server.util.inputspec.userchoiceinput.choiceprovider.ChoiceProvider;
import io.onedev.server.web.editable.annotation.Editable;
import io.onedev.server.web.editable.annotation.OmitName;
import io.onedev.server.web.editable.annotation.UserChoice;
@@ -42,11 +38,7 @@ public class SpecifiedDefaultValue implements DefaultValueProvider {
@SuppressWarnings("unused")
private static List<UserFacade> getValueChoices() {
- ChoiceProvider choiceProvider = (ChoiceProvider) OneContext.get().getEditContext(1).getInputValue("choiceProvider");
- if (choiceProvider != null && OneDev.getInstance(Validator.class).validate(choiceProvider).isEmpty())
- return choiceProvider.getChoices(true);
- else
- return Lists.newArrayList();
+ return OneDev.getInstance(UserManager.class).query().stream().map(user->user.getFacade()).collect(Collectors.toList());
}
}
diff --git a/core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.java b/core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.java
index 567afa2785..8b263eb7d5 100644
--- a/core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.java
+++ b/core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.java
@@ -100,8 +100,8 @@ public abstract class NewIssueEditor extends FormComponentPanel<Issue> implement
milestoneChoice.setRequired(false);
add(milestoneChoice);
- Collection<String> properties = IssueUtils.getPropertyNames(fieldBeanClass,
- getProject().getIssueSetting().getPromptFieldsUponIssueOpen(true));
+ Collection<String> properties = IssueUtils.getPropertyNames(getProject(),
+ fieldBeanClass, getProject().getIssueSetting().getPromptFieldsUponIssueOpen(true));
add(fieldEditor = new BeanContext(fieldBean.getClass(), properties, false).renderForEdit("fields", Model.of(fieldBean)));
}
@@ -157,7 +157,7 @@ public abstract class NewIssueEditor extends FormComponentPanel<Issue> implement
issue.setMilestone(getProject().getMilestone(milestoneChoice.getConvertedInput()));
Collection<String> fieldNames = getProject().getIssueSetting().getPromptFieldsUponIssueOpen(true);
- issue.setFieldValues(IssueUtils.getFieldValues(fieldEditor.getConvertedInput(), fieldNames));
+ issue.setFieldValues(IssueUtils.getFieldValues(fieldEditor.getOneContext(), fieldEditor.getConvertedInput(), fieldNames));
setConvertedInput(issue);
} catch (ConversionException e) {
error(newValidationError(e));
diff --git a/core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.java b/core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.java
index ecce39bc3f..72786f52b9 100644
--- a/core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.java
+++ b/core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.java
@@ -1,6 +1,7 @@
package io.onedev.server.web.component.issue.list;
import java.io.Serializable;
+import java.util.ArrayList;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
@@ -137,7 +138,12 @@ abstract class BatchEditPanel extends Panel implements InputContext {
}).add(newOnChangeBehavior(form)));
- List<String> customFieldNames = getIssueSetting().getFieldNames();
+ List<String> customFieldNames = new ArrayList<>();
+ for (InputSpec field: getIssueSetting().getFieldSpecs()) {
+ if (field.getAllowedWriters().matches(getProject(), SecurityUtils.getUser()))
+ customFieldNames.add(field.getName());
+ }
+
form.add(new ListView<String>("customFields", customFieldNames) {
@Override
@@ -244,8 +250,8 @@ abstract class BatchEditPanel extends Panel implements InputContext {
else
milestone = null;
- Map<String, Object> fieldValues = IssueUtils.getFieldValues(customFieldsBean, selectedFields);
-
+ Map<String, Object> fieldValues = IssueUtils.getFieldValues(customFieldsEditor.getOneContext(),
+ customFieldsBean, selectedFields);
OneDev.getInstance(IssueChangeManager.class).batchUpdate(
getIssueIterator(), state, milestone, fieldValues, comment, SecurityUtils.getUser());
onUpdated(target);
diff --git a/core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.java b/core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.java
index 91be5fdf77..60824b9999 100644
--- a/core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.java
+++ b/core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.java
@@ -117,7 +117,8 @@ public abstract class IssueOperationsPanel extends Panel {
};
- Collection<String> propertyNames = IssueUtils.getPropertyNames(fieldBeanClass, trigger.getPromptFields());
+ Collection<String> propertyNames = IssueUtils.getPropertyNames(getIssue().getProject(),
+ fieldBeanClass, trigger.getPromptFields());
BeanEditor editor = BeanContext.editBean("fields", fieldBean, propertyNames, false);
form.add(editor);
@@ -147,7 +148,7 @@ public abstract class IssueOperationsPanel extends Panel {
super.onSubmit(target, form);
getIssue().removeFields(transition.getRemoveFields());
- Map<String, Object> fieldValues = IssueUtils.getFieldValues(fieldBean, trigger.getPromptFields());
+ Map<String, Object> fieldValues = IssueUtils.getFieldValues(editor.getOneContext(), fieldBean, trigger.getPromptFields());
IssueChangeManager manager = OneDev.getInstance(IssueChangeManager.class);
manager.changeState(getIssue(), transition.getToState(), fieldValues, comment, SecurityUtils.getUser());
onStateChanged(target);
diff --git a/core/src/main/java/io/onedev/server/web/component/issue/side/IssueInfoPanel.java b/core/src/main/java/io/onedev/server/web/component/issue/side/IssueInfoPanel.java
index 21609b3c46..4c11388a4c 100644
--- a/core/src/main/java/io/onedev/server/web/component/issue/side/IssueInfoPanel.java
+++ b/core/src/main/java/io/onedev/server/web/component/issue/side/IssueInfoPanel.java
@@ -65,6 +65,7 @@ import io.onedev.server.web.component.user.ident.UserIdentPanel;
import io.onedev.server.web.component.user.ident.UserIdentPanel.Mode;
import io.onedev.server.web.component.user.list.UserListLink;
import io.onedev.server.web.editable.BeanContext;
+import io.onedev.server.web.editable.BeanEditor;
import io.onedev.server.web.page.project.issues.milestones.MilestoneDetailPage;
import io.onedev.server.web.page.security.LoginPage;
import io.onedev.server.web.util.QueryPositionSupport;
@@ -209,18 +210,19 @@ public abstract class IssueInfoPanel extends Panel {
Class<?> fieldBeanClass = IssueUtils.defineBeanClass(getProject());
Serializable fieldBean = getIssue().getFieldBean(fieldBeanClass, true);
- Collection<String> propertyNames = IssueUtils.getPropertyNames(fieldBeanClass, getIssue().getFieldNames());
- form.add(BeanContext.editBean("editor", fieldBean, propertyNames, false));
+ Collection<String> propertyNames = IssueUtils.getPropertyNames(getIssue().getProject(),
+ fieldBeanClass, getIssue().getFieldNames());
+ BeanEditor beanEditor = BeanContext.editBean("editor", fieldBean, propertyNames, false);
+ form.add(beanEditor);
form.add(new AjaxButton("save") {
@Override
protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
super.onSubmit(target, form);
-
- Map<String, Object> fieldValues = IssueUtils.getFieldValues(fieldBean, getIssue().getFieldNames());
+
+ Map<String, Object> fieldValues = IssueUtils.getFieldValues(beanEditor.getOneContext(), fieldBean, getIssue().getFieldNames());
OneDev.getInstance(IssueChangeManager.class).changeFields(getIssue(), fieldValues, SecurityUtils.getUser());
-
Component fieldsContainer = newFieldsContainer();
IssueInfoPanel.this.replace(fieldsContainer);
target.add(fieldsContainer);
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.java
index 4140d0513a..c24b49413b 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
@@ -37,8 +37,6 @@ import io.onedev.server.web.editable.PathSegment.Property;
import io.onedev.server.web.editable.annotation.Horizontal;
import io.onedev.server.web.editable.annotation.OmitName;
import io.onedev.server.web.editable.annotation.Vertical;
-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.StringUtils;
@@ -180,28 +178,7 @@ public class BeanEditor extends ValueEditor<Serializable> {
@Override
protected void onConfigure() {
super.onConfigure();
-
- if (StringUtils.isNotBlank(getModelValue())) {
- /*
- * Hide the description when bean editor is in-place as we do not want to confuse the bean editor
- * property help with this help
- */
- if (propertyEditor instanceof PolymorphicPropertyEditor || propertyEditor instanceof BeanPropertyEditor) {
- BeanEditor childBeanEditor = propertyEditor.visitChildren(BeanEditor.class, new IVisitor<BeanEditor, BeanEditor>() {
-
- @Override
- public void component(BeanEditor object, IVisit<BeanEditor> visit) {
- visit.stop(object);
- }
-
- });
- setVisible(childBeanEditor == null || !childBeanEditor.isVisible());
- } else {
- setVisible(true);
- }
- } else {
- setVisible(false);
- }
+ setVisible(StringUtils.isNotBlank(getModelValue()));
}
};
@@ -293,20 +270,7 @@ public class BeanEditor extends ValueEditor<Serializable> {
@Override
public void validate(IValidatable<Serializable> validatable) {
- OneContext.push(new ComponentContext(BeanEditor.this) {
-
- @Override
- public OneContext getPropertyContext(String propertyName) {
- for (Component item: propertiesView) {
- int propertyIndex = (int) item.getDefaultModelObject();
- PropertyContext<Serializable> propertyContext = propertyContexts.get(propertyIndex);
- if (propertyContext.getPropertyName().equals(propertyName))
- return new ComponentContext(item);
- }
- return null;
- }
-
- });
+ OneContext.push(getOneContext());
try {
Validator validator = AppLoader.getInstance(Validator.class);
for (ConstraintViolation<Serializable> violation: validator.validate(validatable.getValue())) {
@@ -384,6 +348,23 @@ public class BeanEditor extends ValueEditor<Serializable> {
return bean;
}
+ public OneContext getOneContext() {
+ return new ComponentContext(this) {
+
+ @Override
+ public OneContext getPropertyContext(String propertyName) {
+ for (Component item: propertiesView) {
+ int propertyIndex = (int) item.getDefaultModelObject();
+ PropertyContext<Serializable> propertyContext = propertyContexts.get(propertyIndex);
+ if (propertyContext.getPropertyName().equals(propertyName))
+ return new ComponentContext(item);
+ }
+ return null;
+ }
+
+ };
+ }
+
private abstract class PropertyContainer extends WebMarkupContainer implements EditContext {
public PropertyContainer(String id, int propertyIndex) {
diff --git a/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/FieldBean.java b/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/FieldBean.java
index 81f6f338d0..dddaa2a90a 100644
--- a/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/FieldBean.java
+++ b/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/FieldBean.java
@@ -17,7 +17,7 @@ public class FieldBean implements Serializable {
private boolean promptUponIssueOpen = true;
private boolean displayInIssueList = true;
-
+
@Editable(name="Type", order=100)
@NotNull(message="may not be empty")
public InputSpec getField() {
@@ -45,5 +45,5 @@ public class FieldBean implements Serializable {
public void setDisplayInIssueList(boolean displayInIssueList) {
this.displayInIssueList = displayInIssueList;
}
-
+
}
diff --git a/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueFieldListPage.properties b/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueFieldListPage.properties
index ae86adf5c0..9f9800731f 100644
--- a/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueFieldListPage.properties
+++ b/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueFieldListPage.properties
@@ -2,4 +2,5 @@ resource.input.input=When field
resource.input.description=Optionally describes the custom field
resource.input.showCondition=Enable if visibility of this field depends on other fields
resource.input.allowEmpty=Whether or not this field accepts empty value
-resource.input.allowMultiple=Whether or not multiple values can be specified for this field
\ No newline at end of file
+resource.input.allowMultiple=Whether or not multiple values can be specified for this field
+resource.input.allowedWriters=This setting tells who can change this field when issue is opened or transited
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/StateTransitionPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/StateTransitionPanel.java
index a498879a67..61770a8145 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/StateTransitionPanel.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/StateTransitionPanel.java
@@ -47,7 +47,7 @@ abstract class StateTransitionPanel extends Panel implements InputContext {
PressButtonTrigger trigger = (PressButtonTrigger) getTransition().getTrigger();
BeanEditor editor = BeanContext.editBean("editor", fieldBean,
- IssueUtils.getPropertyNames(fieldBeanClass, trigger.getPromptFields()), false);
+ IssueUtils.getPropertyNames(getIssue().getProject(), fieldBeanClass, trigger.getPromptFields()), false);
form.add(editor);
form.add(new AjaxButton("ok") {
@@ -57,7 +57,7 @@ abstract class StateTransitionPanel extends Panel implements InputContext {
super.onSubmit(target, form);
getIssue().removeFields(getTransition().getRemoveFields());
- Map<String, Object> fieldValues = IssueUtils.getFieldValues(fieldBean, trigger.getPromptFields());
+ Map<String, Object> fieldValues = IssueUtils.getFieldValues(editor.getOneContext(), fieldBean, trigger.getPromptFields());
OneDev.getInstance(IssueChangeManager.class).changeState(getIssue(), getTransition().getToState(), fieldValues, null, SecurityUtils.getUser());
onSaved(target);
}