Skip to content

The Unified and Autonomous Development Platform

fix: Project context not available when scripting issue field default value (OD-2869)

Robin Shen298411fc87f3
diff --git a/server-core/src/main/java/io/onedev/server/model/Issue.java b/server-core/src/main/java/io/onedev/server/model/Issue.java
index cec28c928c..41e4b20206 100644
--- a/server-core/src/main/java/io/onedev/server/model/Issue.java
+++ b/server-core/src/main/java/io/onedev/server/model/Issue.java
@@ -1096,18 +1096,13 @@ public class Issue extends ProjectBelonging implements AttachmentStorageSupport
if (existingFieldNames.containsAll(fieldNames))
return;
- Project.push(getProject());
- try {
- Class<?> fieldBeanClass = FieldUtils.getFieldBeanClass();
- var fieldBean = getFieldBean(fieldBeanClass, true);
-
- var fieldValues = FieldUtils.getFieldValues(fieldBean, fieldNames);
- for (var entry: fieldValues.entrySet()) {
- if (!existingFieldNames.contains(entry.getKey()))
- setFieldValue(entry.getKey(), entry.getValue());
- }
- } finally {
- Project.pop();
+ Class<?> fieldBeanClass = FieldUtils.getFieldBeanClass();
+ var fieldBean = getFieldBean(fieldBeanClass, true);
+
+ var fieldValues = FieldUtils.getFieldValues(getProject(), fieldBean, fieldNames);
+ for (var entry: fieldValues.entrySet()) {
+ if (!existingFieldNames.contains(entry.getKey()))
+ setFieldValue(entry.getKey(), entry.getValue());
}
}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/FieldUtils.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/FieldUtils.java
index 1d60ef026e..cdec948957 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/field/FieldUtils.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/FieldUtils.java
@@ -38,6 +38,7 @@ import io.onedev.server.util.Hierarchical;
import io.onedev.server.util.HierarchicalContext;
import io.onedev.server.web.editable.BeanDescriptor;
import io.onedev.server.web.editable.PropertyDescriptor;
+import io.onedev.server.web.util.ProjectAware;
public class FieldUtils {
@@ -106,8 +107,8 @@ public class FieldUtils {
return null;
}
- public static Map<String, Object> getFieldValues(Serializable fieldBean, Collection<String> fieldNames) {
- HierarchicalContext.push(newHierarchicalContext(new BeanDescriptor(fieldBean.getClass()), fieldBean));
+ public static Map<String, Object> getFieldValues(Project project, Serializable fieldBean, Collection<String> fieldNames) {
+ HierarchicalContext.push(newHierarchicalContext(project, new BeanDescriptor(fieldBean.getClass()), fieldBean));
try {
Map<String, Object> fieldValues = new HashMap<>();
BeanDescriptor beanDescriptor = new BeanDescriptor(fieldBean.getClass());
@@ -208,7 +209,7 @@ public class FieldUtils {
public static Map<String, HierarchicalContext> newPropertyHierarchicalContexts(BeanDescriptor beanDescriptor, Serializable fieldBean) {
Map<String, HierarchicalContext> hierarchicalContexts = new HashMap<>();
- HierarchicalContext hierarchicalContext = new HierarchicalContext(newContextHierarchical(beanDescriptor, fieldBean));
+ HierarchicalContext hierarchicalContext = new HierarchicalContext(newContextHierarchical(null, beanDescriptor, fieldBean));
for (List<PropertyDescriptor> group: beanDescriptor.getProperties().values()) {
for (PropertyDescriptor property: group)
hierarchicalContexts.put(property.getPropertyName(), hierarchicalContext);
@@ -217,7 +218,7 @@ public class FieldUtils {
return hierarchicalContexts;
}
- private static Hierarchical newContextHierarchical(BeanDescriptor beanDescriptor, Serializable fieldBean) {
+ private static Hierarchical newContextHierarchical(@Nullable Project project, BeanDescriptor beanDescriptor, Serializable fieldBean) {
class BeanHierarchical implements Hierarchical {
@Override
@@ -254,6 +255,8 @@ public class FieldUtils {
}
});
+ } else if (project != null && clazz == ProjectAware.class) {
+ return clazz.cast((ProjectAware) () -> project);
} else {
return null;
}
@@ -263,14 +266,14 @@ public class FieldUtils {
return new BeanHierarchical();
}
- public static HierarchicalContext newHierarchicalContext(BeanDescriptor beanDescriptor, Serializable fieldBean) {
- return new HierarchicalContext(newContextHierarchical(beanDescriptor, fieldBean)) {
+ public static HierarchicalContext newHierarchicalContext(Project project, BeanDescriptor beanDescriptor, Serializable fieldBean) {
+ return new HierarchicalContext(newContextHierarchical(project, beanDescriptor, fieldBean)) {
private static final long serialVersionUID = 1L;
@Override
public HierarchicalContext getChildContext(String childName) {
- return new HierarchicalContext(newContextHierarchical(beanDescriptor, fieldBean));
+ return new HierarchicalContext(newContextHierarchical(project, beanDescriptor, fieldBean));
}
};
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.java b/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.java
index f392cbdcab..ba7b6e9348 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.java
@@ -107,7 +107,7 @@ public abstract class NewIssueEditor extends FormComponentPanel<Issue> implement
Serializable fieldBean = issue.getFieldBean(fieldBeanClass, true);
var fieldNames = getIssueSetting().getPromptFieldsUponIssueOpen(getProject());
- issue.setFieldValues(FieldUtils.getFieldValues(fieldBean,
+ issue.setFieldValues(FieldUtils.getFieldValues(getProject(), fieldBean,
FieldUtils.getEditableFields(getProject(), fieldNames)));
titleInput = new TextField<>("title", Model.of(""));
@@ -409,7 +409,7 @@ public abstract class NewIssueEditor extends FormComponentPanel<Issue> implement
fieldEditor.convertInput();
var fieldNames = getIssueSetting().getPromptFieldsUponIssueOpen(getProject());
- issue.setFieldValues(FieldUtils.getFieldValues(fieldEditor.getConvertedInput(), fieldNames));
+ issue.setFieldValues(FieldUtils.getFieldValues(getProject(), fieldEditor.getConvertedInput(), fieldNames));
iterationChoice.convertInput();
issue.getSchedules().clear();
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java
index cca77e48a4..957fb0888e 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java
@@ -183,7 +183,7 @@ public abstract class FieldValuesPanel extends Panel implements EditContext, Pro
@Override
protected String onSave(AjaxRequestTarget target, Serializable bean) {
- fieldValues.putAll(FieldUtils.getFieldValues(bean, FieldUtils.getEditableFields(getProject(), dependentFields)));
+ fieldValues.putAll(FieldUtils.getFieldValues(getProject(), bean, FieldUtils.getEditableFields(getProject(), dependentFields)));
var user = SecurityUtils.getUser();
issueChangeService.changeFields(user, getIssue(), fieldValues);
notifyObservablesChange(target);
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.java
index a6e3e11419..a23b77ee4e 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.java
@@ -311,7 +311,7 @@ abstract class BatchEditPanel extends Panel implements InputContext {
iterations = null;
}
- Map<String, Object> fieldValues = FieldUtils.getFieldValues(customFieldsBean, selectedFields);
+ Map<String, Object> fieldValues = FieldUtils.getFieldValues(getProject(), customFieldsBean, selectedFields);
try {
var user = SecurityUtils.getUser();
OneDev.getInstance(IssueChangeService.class).batchUpdate(
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/transitionoption/TransitionOptionPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/transitionoption/TransitionOptionPanel.java
index b3bea9bff2..b79333e329 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/transitionoption/TransitionOptionPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/transitionoption/TransitionOptionPanel.java
@@ -107,7 +107,7 @@ public abstract class TransitionOptionPanel extends Panel implements InputContex
Collection<String> editableFields = FieldUtils.getEditableFields(
getIssue().getProject(), getTransition().getPromptFields());
- Map<String, Object> fieldValues = FieldUtils.getFieldValues(fieldBean, editableFields);
+ Map<String, Object> fieldValues = FieldUtils.getFieldValues(getIssue().getProject(), fieldBean, editableFields);
onTransit(target, fieldValues, comment);
}
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.java
index a9731f0802..4fd5d8e015 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
@@ -498,7 +498,7 @@ abstract class BoardColumnPanel extends AbstractColumnPanel {
@Override
protected String onSave(AjaxRequestTarget target, Serializable bean) {
- fieldValues.putAll(FieldUtils.getFieldValues(bean, FieldUtils.getEditableFields(getProject(), dependentFields)));
+ fieldValues.putAll(FieldUtils.getFieldValues(getProject(), bean, FieldUtils.getEditableFields(getProject(), dependentFields)));
close();
Issue issue = getIssueService().load(issueId);
getIssueChangeService().changeFields(SecurityUtils.getUser(), issue, fieldValues);
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/StateTransitionPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/StateTransitionPanel.java
index a650ea2597..7d99c24718 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/StateTransitionPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/StateTransitionPanel.java
@@ -59,7 +59,7 @@ abstract class StateTransitionPanel extends Panel implements InputContext {
Collection<String> editableFields = FieldUtils.getEditableFields(
getIssue().getProject(), transition.getPromptFields());
- Map<String, Object> fieldValues = FieldUtils.getFieldValues(fieldBean, editableFields);
+ Map<String, Object> fieldValues = FieldUtils.getFieldValues(getIssue().getProject(), fieldBean, editableFields);
OneDev.getInstance(IssueChangeService.class).changeState(SecurityUtils.getUser(), getIssue(),
getToState(), fieldValues, transition.getPromptFields(), transition.getRemoveFields(), null);
onSaved(target);