Skip to content

The Unified and Autonomous Development Platform

Do not prompt issue state fields if the value is already populated

Robin Shen9216928bb897
diff --git a/core/src/main/java/io/onedev/server/manager/IssueChangeManager.java b/core/src/main/java/io/onedev/server/manager/IssueChangeManager.java
index 5cb0839a7c..2b34151187 100644
--- a/core/src/main/java/io/onedev/server/manager/IssueChangeManager.java
+++ b/core/src/main/java/io/onedev/server/manager/IssueChangeManager.java
@@ -1,6 +1,7 @@
package io.onedev.server.manager;
import java.io.Serializable;
+import java.util.Collection;
import java.util.Map;
import javax.annotation.Nullable;
@@ -16,8 +17,9 @@ public interface IssueChangeManager extends EntityManager<IssueChange> {
void changeDescription(Issue issue, String oldDescription);
- void changeFields(Issue issue, Serializable fieldBean, Map<String, IssueField> prevFields);
+ void changeFields(Issue issue, Serializable fieldBean, Map<String, IssueField> prevFields,
+ Collection<String> promptedFields);
void changeState(Issue issue, Serializable fieldBean, @Nullable String commentContent,
- Map<String, IssueField> prevFields);
+ Map<String, IssueField> prevFields, Collection<String> promptedFields);
}
diff --git a/core/src/main/java/io/onedev/server/manager/IssueFieldUnaryManager.java b/core/src/main/java/io/onedev/server/manager/IssueFieldUnaryManager.java
index 6ef6809283..bfad85a1aa 100644
--- a/core/src/main/java/io/onedev/server/manager/IssueFieldUnaryManager.java
+++ b/core/src/main/java/io/onedev/server/manager/IssueFieldUnaryManager.java
@@ -1,6 +1,7 @@
package io.onedev.server.manager;
import java.io.Serializable;
+import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -24,9 +25,9 @@ public interface IssueFieldUnaryManager extends EntityManager<IssueFieldUnary> {
Serializable readFields(Issue issue);
- void writeFields(Issue issue, Serializable fieldBean);
+ void writeFields(Issue issue, Serializable fieldBean, Collection<String> promptedFields);
- Set<String> getExcludedFields(Project project, String state);
+ Set<String> getExcludedFields(Issue issue, String state);
void onRenameUser(String oldName, String newName);
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueChangeManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueChangeManager.java
index 4ff26f3227..50c3ca175b 100644
--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueChangeManager.java
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueChangeManager.java
@@ -1,6 +1,7 @@
package io.onedev.server.manager.impl;
import java.io.Serializable;
+import java.util.Collection;
import java.util.Date;
import java.util.Map;
@@ -89,14 +90,15 @@ public class DefaultIssueChangeManager extends AbstractEntityManager<IssueChange
@Transactional
@Override
- public void changeFields(Issue issue, Serializable fieldBean, Map<String, IssueField> prevFields) {
+ public void changeFields(Issue issue, Serializable fieldBean, Map<String, IssueField> prevFields,
+ Collection<String> promptedFields) {
LastActivity lastActivity = new LastActivity();
lastActivity.setAction("changed custom fields");
lastActivity.setDate(new Date());
lastActivity.setUser(SecurityUtils.getUser());
issueManager.save(issue);
- issueFieldUnaryManager.writeFields(issue, fieldBean);
+ issueFieldUnaryManager.writeFields(issue, fieldBean, promptedFields);
IssueChange change = new IssueChange();
change.setIssue(issue);
change.setDate(new Date());
@@ -117,7 +119,7 @@ public class DefaultIssueChangeManager extends AbstractEntityManager<IssueChange
@Transactional
@Override
public void changeState(Issue issue, Serializable fieldBean, @Nullable String commentContent,
- Map<String, IssueField> prevFields) {
+ Map<String, IssueField> prevFields, Collection<String> promptedFields) {
long time = System.currentTimeMillis();
LastActivity lastActivity = new LastActivity();
lastActivity.setAction("changed state to \"" + issue.getState() + "\"");
@@ -125,7 +127,7 @@ public class DefaultIssueChangeManager extends AbstractEntityManager<IssueChange
lastActivity.setUser(SecurityUtils.getUser());
issueManager.save(issue);
- issueFieldUnaryManager.writeFields(issue, fieldBean);
+ issueFieldUnaryManager.writeFields(issue, fieldBean, promptedFields);
IssueChange change = new IssueChange();
change.setIssue(issue);
change.setDate(new Date(time));
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueFieldUnaryManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueFieldUnaryManager.java
index 87e89f9948..a4e6e5081a 100644
--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueFieldUnaryManager.java
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueFieldUnaryManager.java
@@ -2,6 +2,7 @@ package io.onedev.server.manager.impl;
import java.io.Serializable;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
@@ -112,7 +113,7 @@ public class DefaultIssueFieldUnaryManager extends AbstractEntityManager<IssueFi
@Transactional
@Override
- public void writeFields(Issue issue, Serializable fieldBean) {
+ public void writeFields(Issue issue, Serializable fieldBean, Collection<String> promptedFields) {
Query query = getSession().createQuery("delete from IssueFieldUnary where issue = :issue");
query.setParameter("issue", issue);
query.executeUpdate();
@@ -156,6 +157,7 @@ public class DefaultIssueFieldUnaryManager extends AbstractEntityManager<IssueFi
field.setName(fieldName);
field.setOrdinal(ordinal);
field.setType(EditableUtils.getDisplayName(fieldSpec.getClass()));
+ field.setPrompted(promptedFields.contains(fieldName));
if (fieldValue != null) {
List<String> strings = fieldSpec.convertToStrings(fieldValue);
@@ -184,16 +186,18 @@ public class DefaultIssueFieldUnaryManager extends AbstractEntityManager<IssueFi
}
@Override
- public Set<String> getExcludedFields(Project project, String state) {
+ public Set<String> getExcludedFields(Issue issue, String state) {
Map<String, PropertyDescriptor> propertyDescriptors =
- new BeanDescriptor(defineFieldBeanClass(project)).getMapOfDisplayNameToPropertyDescriptor();
- StateSpec stateSpec = project.getIssueWorkflow().getStateSpec(state);
+ new BeanDescriptor(defineFieldBeanClass(issue.getProject())).getMapOfDisplayNameToPropertyDescriptor();
+ StateSpec stateSpec = issue.getProject().getIssueWorkflow().getStateSpec(state);
if (stateSpec == null)
throw new OneException("Unable to find state spec: " + state);
Set<String> excludedFields = new HashSet<>();
- for (InputSpec fieldSpec: project.getIssueWorkflow().getFieldSpecs()) {
- if (!stateSpec.getFields().contains(fieldSpec.getName()))
+ for (InputSpec fieldSpec: issue.getProject().getIssueWorkflow().getFieldSpecs()) {
+ if (!stateSpec.getFields().contains(fieldSpec.getName())
+ || issue.getEffectiveFields().containsKey(fieldSpec.getName())) {
excludedFields.add(propertyDescriptors.get(fieldSpec.getName()).getPropertyName());
+ }
}
return excludedFields;
}
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueManager.java
index 9192d151dd..3658e1fdca 100644
--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueManager.java
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueManager.java
@@ -31,6 +31,7 @@ import io.onedev.server.model.support.LastActivity;
import io.onedev.server.model.support.issue.query.IssueCriteria;
import io.onedev.server.model.support.issue.query.IssueQuery;
import io.onedev.server.model.support.issue.query.QueryBuildContext;
+import io.onedev.server.model.support.issue.workflow.StateSpec;
import io.onedev.server.persistence.annotation.Sessional;
import io.onedev.server.persistence.annotation.Transactional;
import io.onedev.server.persistence.dao.AbstractEntityManager;
@@ -73,7 +74,9 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implements
issue.setLastActivity(lastActivity);
issue.setNumber(getNextNumber(issue.getProject()));
save(issue);
- issueFieldManager.writeFields(issue, fieldBean);
+
+ StateSpec initialState = issue.getProject().getIssueWorkflow().getInitialStateSpec();
+ issueFieldManager.writeFields(issue, fieldBean, initialState.getFields());
listenerRegistry.post(new IssueOpened(issue));
}
diff --git a/core/src/main/java/io/onedev/server/model/Issue.java b/core/src/main/java/io/onedev/server/model/Issue.java
index de3639b5aa..b176a5e0ff 100644
--- a/core/src/main/java/io/onedev/server/model/Issue.java
+++ b/core/src/main/java/io/onedev/server/model/Issue.java
@@ -4,9 +4,11 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.Date;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import java.util.UUID;
import javax.annotation.Nullable;
@@ -311,29 +313,29 @@ public class Issue extends AbstractEntity implements Referenceable {
if (effectiveFields == null) {
effectiveFields = new LinkedHashMap<>();
- Collection<String> effectiveFieldNames = getProject().getIssueWorkflow().getEffectiveFields(state);
+ Collection<String> fieldNames = getProject().getIssueWorkflow().getApplicableFields(state);
- Map<String, List<IssueFieldUnary>> fieldMap = new HashMap<>();
- for (IssueFieldUnary field: getFieldUnaries()) {
- if (effectiveFieldNames.contains(field.getName())) {
- List<IssueFieldUnary> fieldsOfName = fieldMap.get(field.getName());
+ Map<String, List<IssueFieldUnary>> unaryMap = new HashMap<>();
+ for (IssueFieldUnary unary: getFieldUnaries()) {
+ if (fieldNames.contains(unary.getName()) && unary.isPrompted()) {
+ List<IssueFieldUnary> fieldsOfName = unaryMap.get(unary.getName());
if (fieldsOfName == null) {
fieldsOfName = new ArrayList<>();
- fieldMap.put(field.getName(), fieldsOfName);
+ unaryMap.put(unary.getName(), fieldsOfName);
}
- fieldsOfName.add(field);
+ fieldsOfName.add(unary);
}
}
for (InputSpec fieldSpec: getProject().getIssueWorkflow().getFieldSpecs()) {
String fieldName = fieldSpec.getName();
- List<IssueFieldUnary> fields = fieldMap.get(fieldName);
- if (fields != null) {
- String type = fields.iterator().next().getType();
+ List<IssueFieldUnary> unaries = unaryMap.get(fieldName);
+ if (unaries != null) {
+ String type = unaries.iterator().next().getType();
List<String> values = new ArrayList<>();
- for (IssueFieldUnary field: fields) {
- if (field.getValue() != null)
- values.add(field.getValue());
+ for (IssueFieldUnary unary: unaries) {
+ if (unary.getValue() != null)
+ values.add(unary.getValue());
}
effectiveFields.put(fieldName, new IssueField(fieldName, type, values));
}
@@ -354,5 +356,13 @@ public class Issue extends AbstractEntity implements Referenceable {
}
return null;
}
-
+
+ public Collection<String> getPromptedFields() {
+ Set<String> promptedFields = new HashSet<>();
+ for (IssueFieldUnary unary: getFieldUnaries()) {
+ if (unary.isPrompted())
+ promptedFields.add(unary.getName());
+ }
+ return promptedFields;
+ }
}
diff --git a/core/src/main/java/io/onedev/server/model/IssueFieldUnary.java b/core/src/main/java/io/onedev/server/model/IssueFieldUnary.java
index 63fa91fb17..e075f7d3c1 100644
--- a/core/src/main/java/io/onedev/server/model/IssueFieldUnary.java
+++ b/core/src/main/java/io/onedev/server/model/IssueFieldUnary.java
@@ -36,6 +36,8 @@ public class IssueFieldUnary extends AbstractEntity {
@Column(nullable=false)
private String type;
+
+ private boolean prompted;
private long ordinal;
@@ -86,4 +88,12 @@ public class IssueFieldUnary extends AbstractEntity {
this.ordinal = ordinal;
}
+ public boolean isPrompted() {
+ return prompted;
+ }
+
+ public void setPrompted(boolean prompted) {
+ this.prompted = prompted;
+ }
+
}
diff --git a/core/src/main/java/io/onedev/server/model/support/issue/workflow/IssueWorkflow.java b/core/src/main/java/io/onedev/server/model/support/issue/workflow/IssueWorkflow.java
index b265457468..a31e0e204a 100644
--- a/core/src/main/java/io/onedev/server/model/support/issue/workflow/IssueWorkflow.java
+++ b/core/src/main/java/io/onedev/server/model/support/issue/workflow/IssueWorkflow.java
@@ -16,12 +16,7 @@ import com.google.common.collect.Lists;
import io.onedev.server.exception.OneException;
import io.onedev.server.model.support.authorized.ProjectWriters;
import io.onedev.server.model.support.issue.workflow.action.PressButton;
-import io.onedev.server.model.support.issue.workflow.transitionprerequisite.TransitionPrerequisite;
-import io.onedev.server.model.support.issue.workflow.transitionprerequisite.ValueIsNotSet;
-import io.onedev.server.model.support.issue.workflow.transitionprerequisite.ValueIsSet;
-import io.onedev.server.model.support.issue.workflow.transitionprerequisite.ValueSpecification;
import io.onedev.server.util.UsageUtils;
-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.util.inputspec.choiceprovider.Choice;
@@ -32,7 +27,7 @@ import io.onedev.server.util.inputspec.showcondition.ValueIsOneOf;
import io.onedev.server.util.inputspec.userchoiceinput.UserChoiceInput;
import io.onedev.server.util.inputspec.userchoiceprovider.ProjectReaders;
-public class IssueWorkflow implements Serializable, InputContext {
+public class IssueWorkflow implements Serializable {
private static final long serialVersionUID = 1L;
@@ -106,6 +101,8 @@ public class IssueWorkflow implements Serializable, InputContext {
fieldSpecs.add(priority);
UserChoiceInput assignee = new UserChoiceInput();
+ assignee.setAllowEmpty(true);
+ assignee.setNameOfEmptyValue("No assignee");
assignee.setChoiceProvider(new ProjectReaders());
assignee.setName("Assignee");
@@ -147,17 +144,10 @@ public class IssueWorkflow implements Serializable, InputContext {
StateSpec open = new StateSpec();
open.setName("Open");
open.setColor("#f1c232");
- open.setFields(Lists.newArrayList("Type", "Priority"));
+ open.setFields(Lists.newArrayList("Type", "Priority", "Assignee"));
stateSpecs.add(open);
- StateSpec assigned = new StateSpec();
- assigned.setName("Assigned");
- assigned.setColor("#9900ff");
- assigned.setFields(Lists.newArrayList("Assignee"));
-
- stateSpecs.add(assigned);
-
StateSpec closed = new StateSpec();
closed.setColor("#cccccc");
closed.setName("Closed");
@@ -166,7 +156,7 @@ public class IssueWorkflow implements Serializable, InputContext {
stateSpecs.add(closed);
TransitionSpec transition = new TransitionSpec();
- transition.setFromStates(Lists.newArrayList("Open", "Assigned"));
+ transition.setFromStates(Lists.newArrayList("Open"));
transition.setToState("Closed");
PressButton pressButton = new PressButton();
pressButton.setName("Close");
@@ -175,39 +165,9 @@ public class IssueWorkflow implements Serializable, InputContext {
transitionSpecs.add(transition);
- transition = new TransitionSpec();
- transition.setFromStates(Lists.newArrayList("Open"));
- transition.setToState("Assigned");
- pressButton = new PressButton();
- pressButton.setName("Assign");
- pressButton.setAuthorized(new ProjectWriters());
- transition.setOnAction(pressButton);
-
- transitionSpecs.add(transition);
-
transition = new TransitionSpec();
transition.setFromStates(Lists.newArrayList("Closed"));
transition.setToState("Open");
- TransitionPrerequisite prerequisite = new TransitionPrerequisite();
- prerequisite.setFieldName("Assignee");
- ValueSpecification specification = new ValueIsNotSet();
- prerequisite.setValueSpecification(specification);
- transition.setPrerequisite(prerequisite);
- pressButton = new PressButton();
- pressButton.setName("Reopen");
- pressButton.setAuthorized(new ProjectWriters());
- transition.setOnAction(pressButton);
-
- transitionSpecs.add(transition);
-
- transition = new TransitionSpec();
- transition.setFromStates(Lists.newArrayList("Closed"));
- transition.setToState("Assigned");
- prerequisite = new TransitionPrerequisite();
- prerequisite.setFieldName("Assignee");
- specification = new ValueIsSet();
- prerequisite.setValueSpecification(specification);
- transition.setPrerequisite(prerequisite);
pressButton = new PressButton();
pressButton.setName("Reopen");
pressButton.setAuthorized(new ProjectWriters());
@@ -295,16 +255,10 @@ public class IssueWorkflow implements Serializable, InputContext {
return stateSpecMap;
}
- @Override
- public List<String> getInputNames() {
+ public List<String> getFieldNames() {
return new ArrayList<>(getFieldSpecMap().keySet());
}
- @Override
- public InputSpec getInputSpec(String inputName) {
- return getFieldSpecMap().get(inputName);
- }
-
public List<String> onDeleteState(String stateName) {
for (Iterator<TransitionSpec> it = getTransitionSpecs().iterator(); it.hasNext();) {
TransitionSpec transition = it.next();
@@ -422,17 +376,12 @@ public class IssueWorkflow implements Serializable, InputContext {
throw new OneException("No any issue state is defined");
}
- @Override
- public boolean isReservedName(String inputName) {
- throw new UnsupportedOperationException();
- }
-
- public Collection<String> getEffectiveFields(String state) {
+ public Collection<String> getApplicableFields(String state) {
int index = getStateSpecIndex(state);
- Collection<String> effectiveFields = new HashSet<>();
+ Collection<String> applicableFields = new HashSet<>();
for (int i=0; i<=index; i++)
- effectiveFields.addAll(getStateSpecs().get(i).getFields());
- return effectiveFields;
+ applicableFields.addAll(getStateSpecs().get(i).getFields());
+ return applicableFields;
}
}
diff --git a/core/src/main/java/io/onedev/server/model/support/issue/workflow/StateSpec.java b/core/src/main/java/io/onedev/server/model/support/issue/workflow/StateSpec.java
index dc57778eae..256ac36578 100644
--- a/core/src/main/java/io/onedev/server/model/support/issue/workflow/StateSpec.java
+++ b/core/src/main/java/io/onedev/server/model/support/issue/workflow/StateSpec.java
@@ -60,7 +60,7 @@ public class StateSpec implements Serializable {
}
@Editable(order=500, name="Required Fields", description="Select issue fields required by this state. "
- + "Required fields will be prompted for user input when issue transits to this state")
+ + "Required fields will be prompted when issue transits to this state")
@ChoiceProvider("getFieldChoices")
@NameOfEmptyValue("No required fields")
public List<String> getFields() {
diff --git a/core/src/main/java/io/onedev/server/model/support/issue/workflow/TransitionSpec.java b/core/src/main/java/io/onedev/server/model/support/issue/workflow/TransitionSpec.java
index 08dc775a0a..7395bd600e 100644
--- a/core/src/main/java/io/onedev/server/model/support/issue/workflow/TransitionSpec.java
+++ b/core/src/main/java/io/onedev/server/model/support/issue/workflow/TransitionSpec.java
@@ -130,13 +130,13 @@ public class TransitionSpec implements Serializable {
}
public void onFieldRename(String oldName, String newName) {
- if (getPrerequisite() != null && getPrerequisite().getFieldName().equals(oldName))
- getPrerequisite().setFieldName(newName);
+ if (getPrerequisite() != null && getPrerequisite().getInputName().equals(oldName))
+ getPrerequisite().setInputName(newName);
}
public List<String> onFieldDelete(String fieldName) {
List<String> usages = new ArrayList<>();
- if (getPrerequisite() != null && getPrerequisite().getFieldName().equals(fieldName))
+ if (getPrerequisite() != null && getPrerequisite().getInputName().equals(fieldName))
usages.add("Prerequisite");
return usages;
}
diff --git a/core/src/main/java/io/onedev/server/model/support/issue/workflow/transitionprerequisite/HasSpecifiedValues.java b/core/src/main/java/io/onedev/server/model/support/issue/workflow/transitionprerequisite/HasSpecifiedValues.java
deleted file mode 100644
index 4b59322629..0000000000
--- a/core/src/main/java/io/onedev/server/model/support/issue/workflow/transitionprerequisite/HasSpecifiedValues.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package io.onedev.server.model.support.issue.workflow.transitionprerequisite;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import io.onedev.server.util.OneContext;
-import io.onedev.server.util.editable.annotation.ChoiceProvider;
-import io.onedev.server.util.editable.annotation.Editable;
-import io.onedev.server.util.editable.annotation.OmitName;
-import io.onedev.server.util.inputspec.InputSpec;
-import io.onedev.server.web.page.project.setting.issueworkflow.IssueWorkflowPage;
-import io.onedev.server.web.util.WicketUtils;
-
-@Editable(order=300, name="Is set to")
-public class HasSpecifiedValues implements ValueSpecification {
-
- private static final long serialVersionUID = 1L;
-
- private static final Logger logger = LoggerFactory.getLogger(HasSpecifiedValues.class);
-
- private List<String> fieldValues;
-
- @Override
- public boolean matches(List<String> values) {
- return values.containsAll(fieldValues);
- }
-
- @Editable(order=100, name="Is set to")
- @ChoiceProvider("getFieldValueChoices")
- @OmitName
- public List<String> getFieldValues() {
- return fieldValues;
- }
-
- public void setFieldValues(List<String> fieldValues) {
- this.fieldValues = fieldValues;
- }
-
- @SuppressWarnings("unused")
- private static List<String> getFieldValueChoices() {
- String fieldName = (String) OneContext.get().getEditContext(1).getInputValue("fieldName");
- if (fieldName != null) {
- IssueWorkflowPage page = (IssueWorkflowPage) WicketUtils.getPage();
- InputSpec fieldSpec = page.getWorkflow().getInputSpec(fieldName);
- if (fieldSpec != null)
- return fieldSpec.getPossibleValues();
- else
- logger.error("Unable to find field spec: " + fieldName);
- }
- return new ArrayList<>();
- }
-
-}
diff --git a/core/src/main/java/io/onedev/server/model/support/issue/workflow/transitionprerequisite/TransitionPrerequisite.java b/core/src/main/java/io/onedev/server/model/support/issue/workflow/transitionprerequisite/TransitionPrerequisite.java
index 42b97a5781..d0ef044ea1 100644
--- a/core/src/main/java/io/onedev/server/model/support/issue/workflow/transitionprerequisite/TransitionPrerequisite.java
+++ b/core/src/main/java/io/onedev/server/model/support/issue/workflow/transitionprerequisite/TransitionPrerequisite.java
@@ -1,50 +1,61 @@
package io.onedev.server.model.support.issue.workflow.transitionprerequisite;
import java.io.Serializable;
+import java.util.ArrayList;
import java.util.List;
import javax.validation.constraints.NotNull;
+import org.hibernate.validator.constraints.NotEmpty;
+
+import io.onedev.server.util.OneContext;
import io.onedev.server.util.editable.annotation.ChoiceProvider;
import io.onedev.server.util.editable.annotation.Editable;
import io.onedev.server.util.editable.annotation.OmitName;
-import io.onedev.server.web.page.project.setting.issueworkflow.IssueWorkflowPage;
-import io.onedev.server.web.util.WicketUtils;
@Editable
public class TransitionPrerequisite implements Serializable {
private static final long serialVersionUID = 1L;
- private String fieldName;
+ private String inputName;
- private ValueSpecification valueSpecification;
+ private ValueMatcher valueMatcher;
@Editable(order=100, name="When field")
@ChoiceProvider("getFieldNameChoices")
- public String getFieldName() {
- return fieldName;
+ @NotEmpty
+ public String getInputName() {
+ return inputName;
}
- public void setFieldName(String fieldName) {
- this.fieldName = fieldName;
+ public void setInputName(String fieldName) {
+ this.inputName = fieldName;
}
@Editable(order=200)
@NotNull
@OmitName
- public ValueSpecification getValueSpecification() {
- return valueSpecification;
+ public ValueMatcher getValueMatcher() {
+ return valueMatcher;
}
- public void setValueSpecification(ValueSpecification valueSpecification) {
- this.valueSpecification = valueSpecification;
+ public void setValueMatcher(ValueMatcher valueMatcher) {
+ this.valueMatcher = valueMatcher;
}
@SuppressWarnings("unused")
private static List<String> getFieldNameChoices() {
- IssueWorkflowPage page = (IssueWorkflowPage) WicketUtils.getPage();
- return page.getWorkflow().getInputNames();
+ return new ArrayList<>(OneContext.get().getInputContext().getInputNames());
+ }
+
+ public boolean matches(List<String> values) {
+ if (values.isEmpty())
+ return valueMatcher.matches(null);
+ else if (values.size() == 1)
+ return valueMatcher.matches(values.iterator().next());
+ else
+ throw new IllegalStateException("Transition prerequisite should not be based on a multi-value input");
}
}
diff --git a/core/src/main/java/io/onedev/server/model/support/issue/workflow/transitionprerequisite/ValueIsEmpty.java b/core/src/main/java/io/onedev/server/model/support/issue/workflow/transitionprerequisite/ValueIsEmpty.java
new file mode 100644
index 0000000000..5218cca0d8
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/model/support/issue/workflow/transitionprerequisite/ValueIsEmpty.java
@@ -0,0 +1,15 @@
+package io.onedev.server.model.support.issue.workflow.transitionprerequisite;
+
+import io.onedev.server.util.editable.annotation.Editable;
+
+@Editable(order=400, name="is empty")
+public class ValueIsEmpty implements ValueMatcher {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public boolean matches(String value) {
+ return value == null;
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/model/support/issue/workflow/transitionprerequisite/ValueIsNotAnyOf.java b/core/src/main/java/io/onedev/server/model/support/issue/workflow/transitionprerequisite/ValueIsNotAnyOf.java
new file mode 100644
index 0000000000..a6928e3a81
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/model/support/issue/workflow/transitionprerequisite/ValueIsNotAnyOf.java
@@ -0,0 +1,58 @@
+package io.onedev.server.model.support.issue.workflow.transitionprerequisite;
+
+import java.util.List;
+
+import javax.validation.constraints.Size;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.google.common.collect.Lists;
+
+import io.onedev.server.util.OneContext;
+import io.onedev.server.util.editable.annotation.ChoiceProvider;
+import io.onedev.server.util.editable.annotation.Editable;
+import io.onedev.server.util.editable.annotation.OmitName;
+import io.onedev.server.util.inputspec.InputSpec;
+
+@Editable(order=200, name="does not have any value of")
+public class ValueIsNotAnyOf implements ValueMatcher {
+
+ private static final long serialVersionUID = 1L;
+
+ private static final Logger logger = LoggerFactory.getLogger(ValueIsNotAnyOf.class);
+
+ private List<String> values;
+
+ @Editable
+ @ChoiceProvider("getValueChoices")
+ @OmitName
+ @Size(min=1, message="At least one value needs to be specified")
+ public List<String> getValues() {
+ return values;
+ }
+
+ public void setValues(List<String> values) {
+ this.values = values;
+ }
+
+ @SuppressWarnings("unused")
+ private static List<String> getValueChoices() {
+ // Access on-screen value of ShowCondition.fiedName
+ String inputName = (String) OneContext.get().getEditContext(1).getInputValue("inputName");
+ if (inputName != null) {
+ InputSpec inputSpec = OneContext.get().getInputContext().getInputSpec(inputName);
+ if (inputSpec != null)
+ return inputSpec.getPossibleValues();
+ else
+ logger.error("Unable to find input spec: " + inputName);
+ }
+ return Lists.newArrayList();
+ }
+
+ @Override
+ public boolean matches(String value) {
+ return !getValues().contains(value);
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/model/support/issue/workflow/transitionprerequisite/ValueIsNotEmpty.java b/core/src/main/java/io/onedev/server/model/support/issue/workflow/transitionprerequisite/ValueIsNotEmpty.java
new file mode 100644
index 0000000000..138171c46b
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/model/support/issue/workflow/transitionprerequisite/ValueIsNotEmpty.java
@@ -0,0 +1,15 @@
+package io.onedev.server.model.support.issue.workflow.transitionprerequisite;
+
+import io.onedev.server.util.editable.annotation.Editable;
+
+@Editable(order=300, name="is not empty")
+public class ValueIsNotEmpty implements ValueMatcher {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public boolean matches(String value) {
+ return value != null;
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/model/support/issue/workflow/transitionprerequisite/ValueIsNotSet.java b/core/src/main/java/io/onedev/server/model/support/issue/workflow/transitionprerequisite/ValueIsNotSet.java
deleted file mode 100644
index ccfa8d0531..0000000000
--- a/core/src/main/java/io/onedev/server/model/support/issue/workflow/transitionprerequisite/ValueIsNotSet.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package io.onedev.server.model.support.issue.workflow.transitionprerequisite;
-
-import java.util.List;
-
-import io.onedev.server.util.editable.annotation.Editable;
-
-@Editable(order=200, name="Is not set")
-public class ValueIsNotSet implements ValueSpecification {
-
- private static final long serialVersionUID = 1L;
-
- @Override
- public boolean matches(List<String> values) {
- return values.isEmpty() || values.iterator().next() == null;
- }
-
-}
diff --git a/core/src/main/java/io/onedev/server/model/support/issue/workflow/transitionprerequisite/ValueIsOneOf.java b/core/src/main/java/io/onedev/server/model/support/issue/workflow/transitionprerequisite/ValueIsOneOf.java
new file mode 100644
index 0000000000..0e5b692849
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/model/support/issue/workflow/transitionprerequisite/ValueIsOneOf.java
@@ -0,0 +1,58 @@
+package io.onedev.server.model.support.issue.workflow.transitionprerequisite;
+
+import java.util.List;
+
+import javax.validation.constraints.Size;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.google.common.collect.Lists;
+
+import io.onedev.server.util.OneContext;
+import io.onedev.server.util.editable.annotation.ChoiceProvider;
+import io.onedev.server.util.editable.annotation.Editable;
+import io.onedev.server.util.editable.annotation.OmitName;
+import io.onedev.server.util.inputspec.InputSpec;
+
+@Editable(order=100, name="has value of")
+public class ValueIsOneOf implements ValueMatcher {
+
+ private static final long serialVersionUID = 1L;
+
+ private static final Logger logger = LoggerFactory.getLogger(ValueIsOneOf.class);
+
+ private List<String> values;
+
+ @Editable
+ @ChoiceProvider("getValueChoices")
+ @OmitName
+ @Size(min=1, message="At least one value needs to be specified")
+ public List<String> getValues() {
+ return values;
+ }
+
+ public void setValues(List<String> values) {
+ this.values = values;
+ }
+
+ @SuppressWarnings("unused")
+ private static List<String> getValueChoices() {
+ // Access on-screen value of ShowCondition.fiedName
+ String inputName = (String) OneContext.get().getEditContext(1).getInputValue("inputName");
+ if (inputName != null) {
+ InputSpec inputSpec = OneContext.get().getInputContext().getInputSpec(inputName);
+ if (inputSpec != null)
+ return inputSpec.getPossibleValues();
+ else
+ logger.error("Unable to find input spec: " + inputName);
+ }
+ return Lists.newArrayList();
+ }
+
+ @Override
+ public boolean matches(String value) {
+ return getValues().contains(value);
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/model/support/issue/workflow/transitionprerequisite/ValueIsSet.java b/core/src/main/java/io/onedev/server/model/support/issue/workflow/transitionprerequisite/ValueIsSet.java
deleted file mode 100644
index 47a494c810..0000000000
--- a/core/src/main/java/io/onedev/server/model/support/issue/workflow/transitionprerequisite/ValueIsSet.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package io.onedev.server.model.support.issue.workflow.transitionprerequisite;
-
-import java.util.List;
-
-import io.onedev.server.util.editable.annotation.Editable;
-
-@Editable(order=100, name="Is set")
-public class ValueIsSet implements ValueSpecification {
-
- private static final long serialVersionUID = 1L;
-
- @Override
- public boolean matches(List<String> values) {
- return !values.isEmpty() && values.iterator().next() != null;
- }
-
-}
diff --git a/core/src/main/java/io/onedev/server/model/support/issue/workflow/transitionprerequisite/ValueSpecification.java b/core/src/main/java/io/onedev/server/model/support/issue/workflow/transitionprerequisite/ValueMatcher.java
similarity index 59%
rename from core/src/main/java/io/onedev/server/model/support/issue/workflow/transitionprerequisite/ValueSpecification.java
rename to core/src/main/java/io/onedev/server/model/support/issue/workflow/transitionprerequisite/ValueMatcher.java
index 3d71a8354c..d6c6c23897 100644
--- a/core/src/main/java/io/onedev/server/model/support/issue/workflow/transitionprerequisite/ValueSpecification.java
+++ b/core/src/main/java/io/onedev/server/model/support/issue/workflow/transitionprerequisite/ValueMatcher.java
@@ -1,13 +1,12 @@
package io.onedev.server.model.support.issue.workflow.transitionprerequisite;
import java.io.Serializable;
-import java.util.List;
import io.onedev.server.util.editable.annotation.Editable;
@Editable
-public interface ValueSpecification extends Serializable {
-
- boolean matches(List<String> values);
+public interface ValueMatcher extends Serializable {
+
+ boolean matches(String value);
}
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.java
index 76125ffb2c..616571df90 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
@@ -2,6 +2,7 @@ package io.onedev.server.web.page.project.issues.issuedetail;
import java.io.Serializable;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.Date;
@@ -50,6 +51,7 @@ import com.google.common.collect.Lists;
import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
import io.onedev.server.OneDev;
+import io.onedev.server.exception.OneException;
import io.onedev.server.manager.IssueChangeManager;
import io.onedev.server.manager.IssueFieldUnaryManager;
import io.onedev.server.manager.IssueManager;
@@ -65,6 +67,7 @@ import io.onedev.server.model.support.issue.IssueField;
import io.onedev.server.model.support.issue.WatchStatus;
import io.onedev.server.model.support.issue.query.IssueQuery;
import io.onedev.server.model.support.issue.workflow.IssueWorkflow;
+import io.onedev.server.model.support.issue.workflow.StateSpec;
import io.onedev.server.model.support.issue.workflow.TransitionSpec;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.inputspec.InputContext;
@@ -249,13 +252,13 @@ public abstract class IssueDetailPage extends ProjectPage implements InputContex
if (transition.getPrerequisite() == null) {
applicable = true;
} else {
- IssueField field = getIssue().getEffectiveFields().get(transition.getPrerequisite().getFieldName());
+ IssueField field = getIssue().getEffectiveFields().get(transition.getPrerequisite().getInputName());
List<String> fieldValues;
if (field != null)
fieldValues = field.getValues();
else
fieldValues = new ArrayList<>();
- if (transition.getPrerequisite().getValueSpecification().matches(fieldValues))
+ if (transition.getPrerequisite().matches(fieldValues))
applicable = true;
}
if (applicable) {
@@ -267,7 +270,7 @@ public abstract class IssueDetailPage extends ProjectPage implements InputContex
public void onClick(AjaxRequestTarget target) {
Fragment fragment = new Fragment(ACTION_OPTIONS_ID, "transitionFrag", IssueDetailPage.this);
Serializable fieldBean = getIssueFieldUnaryManager().readFields(getIssue());
- Set<String> excludedFields = getIssueFieldUnaryManager().getExcludedFields(getIssue().getProject(), transition.getToState());
+ Set<String> excludedFields = getIssueFieldUnaryManager().getExcludedFields(getIssue(), transition.getToState());
Form<?> form = new Form<Void>("form") {
@@ -301,15 +304,21 @@ public abstract class IssueDetailPage extends ProjectPage implements InputContex
});
- Map<String, IssueField> prevFields = getIssue().getEffectiveFields();
-
form.add(new AjaxButton("save") {
@Override
protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
super.onSubmit(target, form);
+
+ Map<String, IssueField> prevFields = getIssue().getEffectiveFields();
+ Collection<String> promptedFields = getIssue().getPromptedFields();
+ StateSpec toStateSpec = getProject().getIssueWorkflow().getStateSpec(transition.getToState());
+ if (toStateSpec == null)
+ throw new OneException("Unable to find state spec: " + transition.getToState());
+ promptedFields.addAll(toStateSpec.getFields());
+
getIssue().setState(transition.getToState());
- getIssueChangeManager().changeState(getIssue(), fieldBean, comment, prevFields);
+ getIssueChangeManager().changeState(getIssue(), fieldBean, comment, prevFields, promptedFields);
setResponsePage(IssueActivitiesPage.class, IssueActivitiesPage.paramsOf(getIssue(), position));
}
@@ -606,7 +615,9 @@ public abstract class IssueDetailPage extends ProjectPage implements InputContex
@Override
protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
super.onSubmit(target, form);
- OneDev.getInstance(IssueChangeManager.class).changeFields(getIssue(), fieldBean, prevFields);
+
+ OneDev.getInstance(IssueChangeManager.class).changeFields(getIssue(), fieldBean, prevFields,
+ getIssue().getPromptedFields());
modal.close();
target.add(fieldsContainer);
}
@@ -929,12 +940,12 @@ public abstract class IssueDetailPage extends ProjectPage implements InputContex
@Override
public List<String> getInputNames() {
- return getProject().getIssueWorkflow().getInputNames();
+ return getProject().getIssueWorkflow().getFieldNames();
}
@Override
public InputSpec getInputSpec(String inputName) {
- return getProject().getIssueWorkflow().getInputSpec(inputName);
+ return getProject().getIssueWorkflow().getFieldSpec(inputName);
}
@Override
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/issue-detail.css b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/issue-detail.css
index 7a7c777121..873111a55e 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/issue-detail.css
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/issue-detail.css
@@ -100,7 +100,7 @@
white-space: nowrap;
padding-right: 20px;
}
-#issue-detail>.side .fields .values .value>div {
+#issue-detail>.side .fields .values .value>div, #issue-detail>.side .fields .values i {
display: table-cell;
border-radius: 3px;
padding: 3px 6px;
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/IssueListPage.html b/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/IssueListPage.html
index cd9c53cd92..42cdca6798 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/IssueListPage.html
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/IssueListPage.html
@@ -91,7 +91,6 @@
</div>
<div class="modal-footer clearfix">
<input wicket:id="save" type="submit" class="dirty-aware btn btn-primary" value="Save"></input>
- <a wicket:id="saveAsDefault" class="dirty-aware btn btn-primary">Save as Default</a>
<a wicket:id="cancel" class="btn btn-default">Cancel</a>
</div>
</form>
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/IssueListPage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/IssueListPage.java
index 0490eddedd..70eec16cc5 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/IssueListPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/IssueListPage.java
@@ -12,7 +12,6 @@ import java.util.concurrent.atomic.AtomicReference;
import javax.annotation.Nullable;
import org.apache.wicket.Component;
-import org.apache.wicket.MetaDataKey;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
@@ -61,7 +60,6 @@ import io.onedev.server.model.support.issue.query.IssueQuery;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.DateUtils;
import io.onedev.server.web.WebConstants;
-import io.onedev.server.web.WebSession;
import io.onedev.server.web.component.IssueStateLabel;
import io.onedev.server.web.component.datatable.HistoryAwarePagingNavigator;
import io.onedev.server.web.component.link.UserLink;
@@ -92,8 +90,6 @@ public class IssueListPage extends ProjectPage {
private static final String PARAM_QUERY = "query";
- private static final MetaDataKey<ArrayList<String>> FIELDS_KEY = new MetaDataKey<ArrayList<String>>() {};
-
private String query;
private Component querySave;
@@ -103,13 +99,6 @@ public class IssueListPage extends ProjectPage {
query = params.get(PARAM_QUERY).toOptionalString();
}
- private List<String> getFields() {
- List<String> fields = WebSession.get().getMetaData(FIELDS_KEY);
- if (fields == null)
- fields = getProject().getIssueWorkflow().getListFields();
- return fields;
- }
-
private Map<String, String> getUserQueries() {
IssueQuerySetting setting = getIssueQuerySettingManager().find(getProject(), getLoginUser());
if (setting != null)
@@ -531,7 +520,7 @@ public class IssueListPage extends ProjectPage {
Fragment fragment = new Fragment(id, "fieldsFrag", IssueListPage.this);
FieldsEditBean bean = new FieldsEditBean();
- bean.setFields(getFields());
+ bean.setFields(getProject().getIssueWorkflow().getListFields());
Form<?> form = new Form<Void>("form") {
@Override
@@ -557,24 +546,6 @@ public class IssueListPage extends ProjectPage {
@Override
protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
super.onSubmit(target, form);
- WebSession.get().setMetaData(FIELDS_KEY, (ArrayList<String>)bean.getFields());
- setResponsePage(IssueListPage.this);
- }
-
- });
-
- form.add(new AjaxButton("saveAsDefault") {
-
- @Override
- protected void onConfigure() {
- super.onConfigure();
- setVisible(SecurityUtils.canManage(getProject()));
- }
-
- @Override
- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
- super.onSubmit(target, form);
- WebSession.get().setMetaData(FIELDS_KEY, (ArrayList<String>)bean.getFields());
getProject().getIssueWorkflow().setListFields(bean.getFields());
OneDev.getInstance(ProjectManager.class).save(getProject());
setResponsePage(IssueListPage.this);
@@ -594,6 +565,12 @@ public class IssueListPage extends ProjectPage {
fragment.add(form);
return fragment;
}
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setVisible(SecurityUtils.canManage(getProject()));
+ }
});
@@ -740,7 +717,7 @@ public class IssueListPage extends ProjectPage {
item.add(new IssueStateLabel("state", item.getModel()));
RepeatingView fieldsView = new RepeatingView("fields");
- for (String fieldName: getFields()) {
+ for (String fieldName: getProject().getIssueWorkflow().getListFields()) {
fieldsView.add(new FieldValuesPanel(fieldsView.newChildId()) {
@Override
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/newissue/NewIssuePage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/newissue/NewIssuePage.java
index 3b7cfcacbf..3062015d6a 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/newissue/NewIssuePage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/newissue/NewIssuePage.java
@@ -104,8 +104,8 @@ public class NewIssuePage extends ProjectPage implements InputContext {
});
- Set<String> excludedFields = getIssueFieldManager().getExcludedFields(
- getProject(), getProject().getIssueWorkflow().getInitialStateSpec().getName());
+ Set<String> excludedFields = getIssueFieldManager().getExcludedFields(issue,
+ getProject().getIssueWorkflow().getInitialStateSpec().getName());
form.add(BeanContext.editBean("fields", fieldBean, excludedFields));
add(form);
@@ -119,12 +119,12 @@ public class NewIssuePage extends ProjectPage implements InputContext {
@Override
public List<String> getInputNames() {
- return getProject().getIssueWorkflow().getInputNames();
+ return getProject().getIssueWorkflow().getFieldNames();
}
@Override
public InputSpec getInputSpec(String inputName) {
- return getProject().getIssueWorkflow().getInputSpec(inputName);
+ return getProject().getIssueWorkflow().getFieldSpec(inputName);
}
@Override
diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/fields/IssueFieldsPage.html b/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/fields/IssueFieldsPage.html
index 4509ef5696..4002ba5598 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/fields/IssueFieldsPage.html
+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/fields/IssueFieldsPage.html
@@ -6,6 +6,9 @@
</div>
</div>
<table wicket:id="issueFields" class="table table-hover"></table>
+ <div class="help-block">
+ <b><i class="fa fa-lightbulb-o"></i> Tips:</b> Fields defined here will not take effect unless they are required by specific issue state
+ </div>
</div>
<wicket:fragment wicket:id="nameColumnFrag">
<span class="drag-handle fa fa-arrows" title="Drag to reorder fields"></span>
diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/states/issue-states.css b/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/states/issue-states.css
index 2b8cfe4141..757f9874b7 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/states/issue-states.css
+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/states/issue-states.css
@@ -32,6 +32,9 @@
height: 24px;
border-radius: 3px;
}
+.floating.state-spec {
+ width: 600px;
+}
.floating.state-spec .actions {
margin-bottom: 12px;
}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/statetransitions/TransitionEditPanel.java b/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/statetransitions/TransitionEditPanel.java
index 5f79322c8d..4020f8e72e 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/statetransitions/TransitionEditPanel.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/statetransitions/TransitionEditPanel.java
@@ -1,5 +1,7 @@
package io.onedev.server.web.page.project.setting.issueworkflow.statetransitions;
+import java.util.List;
+
import org.apache.commons.lang3.SerializationUtils;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
@@ -14,6 +16,8 @@ import io.onedev.server.manager.ProjectManager;
import io.onedev.server.model.Project;
import io.onedev.server.model.support.issue.workflow.IssueWorkflow;
import io.onedev.server.model.support.issue.workflow.TransitionSpec;
+import io.onedev.server.util.inputspec.InputContext;
+import io.onedev.server.util.inputspec.InputSpec;
import io.onedev.server.web.editable.BeanContext;
import io.onedev.server.web.editable.BeanEditor;
import io.onedev.server.web.editable.PathSegment;
@@ -21,7 +25,7 @@ import io.onedev.server.web.page.project.ProjectPage;
import io.onedev.server.web.util.ajaxlistener.ConfirmLeaveListener;
@SuppressWarnings("serial")
-abstract class TransitionEditPanel extends Panel {
+abstract class TransitionEditPanel extends Panel implements InputContext {
private final int transitionIndex;
@@ -116,6 +120,21 @@ abstract class TransitionEditPanel extends Panel {
add(form);
}
+ @Override
+ public List<String> getInputNames() {
+ return getWorkflow().getFieldNames();
+ }
+
+ @Override
+ public InputSpec getInputSpec(String inputName) {
+ return getWorkflow().getFieldSpec(inputName);
+ }
+
+ @Override
+ public boolean isReservedName(String inputName) {
+ throw new UnsupportedOperationException();
+ }
+
protected abstract IssueWorkflow getWorkflow();
protected abstract void onSave(AjaxRequestTarget target);
diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/statetransitions/state-transitions.css b/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/statetransitions/state-transitions.css
index 61b1d163f2..b3eac87531 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/statetransitions/state-transitions.css
+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/statetransitions/state-transitions.css
@@ -16,19 +16,19 @@
font-weight: normal;
}
.floating.state-transition {
- width: 400px;
+ width: 600px;
}
.floating.state-transition .actions {
margin-bottom: 12px;
}
.floating.state-transition .property-authorized .name {
- font-weight: normal;
border-right: none;
+ text-align: left;
}
.floating.state-transition .property-authorized .value {
white-space: nowrap;
}
.floating.state-transition .property-prerequisite .property-fieldName td.name {
- font-weight: normal;
border-right: none;
+ text-align: left;
}
\ No newline at end of file