The Unified and Autonomous Development Platform
Define issue custom fields in transition spec instead of state spec
Robin Shenf66c75111b8c
diff --git a/core/src/main/java/io/onedev/server/entityquery/issue/IssueQuery.g4 b/core/src/main/java/io/onedev/server/entityquery/issue/IssueQuery.g4index f4552e8c6b..effb136b75 100644--- a/core/src/main/java/io/onedev/server/entityquery/issue/IssueQuery.g4+++ b/core/src/main/java/io/onedev/server/entityquery/issue/IssueQuery.g4@@ -7,7 +7,7 @@ query;criteria- : operator=(Mine|Open|Closed|SubmittedByMe) #OperatorCriteria+ : operator=(Mine|Outstanding|Closed|SubmittedByMe) #OperatorCriteria| SubmittedBy WS+ criteriaValue=Quoted #OperatorValueCriteria| criteriaField=Quoted WS+ operator=(IsMe|IsEmpty) #FieldOperatorCriteria| criteriaField=Quoted WS+ operator=(Is|IsGreaterThan|IsLessThan|IsBefore|IsAfter|Contains) WS+ criteriaValue=Quoted #FieldOperatorValueCriteria@@ -29,8 +29,8 @@ All: 'all';-Open- : 'open'+Outstanding+ : 'outstanding';Closeddiff --git a/core/src/main/java/io/onedev/server/entityquery/issue/IssueQuery.java b/core/src/main/java/io/onedev/server/entityquery/issue/IssueQuery.javaindex c2c4ce7701..9c25d8d275 100644--- a/core/src/main/java/io/onedev/server/entityquery/issue/IssueQuery.java+++ b/core/src/main/java/io/onedev/server/entityquery/issue/IssueQuery.java@@ -163,8 +163,8 @@ public class IssueQuery extends EntityQuery<Issue> {switch (ctx.operator.getType()) {case IssueQueryLexer.Mine:return new MineCriteria();- case IssueQueryLexer.Open:- return new OpenCriteria();+ case IssueQueryLexer.Outstanding:+ return new OutstandingCriteria();case IssueQueryLexer.Closed:return new ClosedCriteria();case IssueQueryLexer.SubmittedByMe:diff --git a/core/src/main/java/io/onedev/server/entityquery/issue/OpenCriteria.java b/core/src/main/java/io/onedev/server/entityquery/issue/OutstandingCriteria.javasimilarity index 88%rename from core/src/main/java/io/onedev/server/entityquery/issue/OpenCriteria.javarename to core/src/main/java/io/onedev/server/entityquery/issue/OutstandingCriteria.javaindex e2b4c0d36b..9e2994fe5e 100644--- a/core/src/main/java/io/onedev/server/entityquery/issue/OpenCriteria.java+++ b/core/src/main/java/io/onedev/server/entityquery/issue/OutstandingCriteria.java@@ -8,7 +8,7 @@ import io.onedev.server.model.Project;import io.onedev.server.entityquery.issue.IssueQueryLexer;import io.onedev.server.model.support.issue.workflow.StateSpec;-public class OpenCriteria extends IssueCriteria {+public class OutstandingCriteria extends IssueCriteria {private static final long serialVersionUID = 1L;@@ -33,7 +33,7 @@ public class OpenCriteria extends IssueCriteria {@Overridepublic String toString() {- return IssueQuery.getRuleName(IssueQueryLexer.Open);+ return IssueQuery.getRuleName(IssueQueryLexer.Outstanding);}}diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueActionManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueActionManager.javaindex 3c46b2100f..8773be27d6 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueActionManager.java+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueActionManager.java@@ -225,6 +225,7 @@ public class DefaultIssueActionManager extends AbstractEntityManager<IssueActionMap<String, Object> fieldValues = new HashMap<>();if (trigger.getBuildField() != null)fieldValues.put(trigger.getBuildField(), event.getBuild().getNumber());+ issue.removeFields(transition.getRemoveFields());changeState(issue, transition.getToState(), fieldValues, null);}}@@ -243,6 +244,7 @@ public class DefaultIssueActionManager extends AbstractEntityManager<IssueActionMap<String, Object> fieldValues = new HashMap<>();if (trigger.getPullRequestField() != null)fieldValues.put(trigger.getPullRequestField(), request.getNumber());+ issue.removeFields(transition.getRemoveFields());changeState(issue, transition.getToState(), fieldValues, null);}}@@ -271,8 +273,10 @@ public class DefaultIssueActionManager extends AbstractEntityManager<IssueActionpublic void on(IssueCommitted event) {Issue issue = event.getIssue();for (TransitionSpec transition: issue.getProject().getIssueWorkflow().getTransitionSpecs()) {- if (transition.getTrigger() instanceof CommitTrigger && transition.getFromStates().contains(issue.getState()))+ if (transition.getTrigger() instanceof CommitTrigger && transition.getFromStates().contains(issue.getState())) {+ issue.removeFields(transition.getRemoveFields());changeState(issue, transition.getToState(), new HashMap<>(), null);+ }}}diff --git a/core/src/main/java/io/onedev/server/model/Issue.java b/core/src/main/java/io/onedev/server/model/Issue.javaindex f6929aed3f..0ef33e2f56 100644--- a/core/src/main/java/io/onedev/server/model/Issue.java+++ b/core/src/main/java/io/onedev/server/model/Issue.java@@ -10,6 +10,7 @@ import java.util.LinkedHashMap;import java.util.List;import java.util.Map;import java.util.UUID;+import java.util.stream.Collectors;import javax.annotation.Nullable;import javax.persistence.CascadeType;@@ -39,11 +40,9 @@ import io.onedev.server.model.support.EntityWatch;import io.onedev.server.model.support.LastActivity;import io.onedev.server.model.support.Referenceable;import io.onedev.server.model.support.issue.IssueField;-import io.onedev.server.model.support.issue.IssueConstants;import io.onedev.server.model.support.issue.workflow.IssueWorkflow;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.inputspec.InputSpec;-import io.onedev.server.util.inputspec.showcondition.ShowCondition;import io.onedev.server.web.editable.BeanDescriptor;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.annotation.Editable;@@ -315,6 +314,10 @@ public class Issue extends AbstractEntity implements Referenceable {}}+ public Collection<String> getFieldNames() {+ return getFieldUnaries().stream().map(it->it.getName()).collect(Collectors.toSet());+ }+public Map<String, IssueField> getFields() {Map<String, IssueField> fields = new LinkedHashMap<>();@@ -379,19 +382,22 @@ public class Issue extends AbstractEntity implements Referenceable {Serializable fieldBean = (Serializable) beanDescriptor.newBeanInstance();for (PropertyDescriptor property: beanDescriptor.getPropertyDescriptors()) {- if (property.getDisplayName().equals(IssueConstants.FIELD_STATE)) {- property.setPropertyValue(fieldBean, getState());- } else {- IssueField field = getFields().get(property.getDisplayName());- if (field != null)- property.setPropertyValue(fieldBean, field.getValue(getProject()));- else if (!withDefaultValue)- property.setPropertyValue(fieldBean, null);- }+ IssueField field = getFields().get(property.getDisplayName());+ if (field != null)+ property.setPropertyValue(fieldBean, field.getValue(getProject()));+ else if (!withDefaultValue)+ property.setPropertyValue(fieldBean, null);}return fieldBean;}+ public void removeFields(Collection<String> fieldNames) {+ for (Iterator<IssueFieldUnary> it = getFieldUnaries().iterator(); it.hasNext();) {+ if (fieldNames.contains(it.next().getName()))+ it.remove();+ }+ }+public void setFieldValues(Map<String, Object> fieldValues) {for (Map.Entry<String, Object> entry: fieldValues.entrySet())setFieldValue(entry.getKey(), entry.getValue());@@ -431,31 +437,22 @@ public class Issue extends AbstractEntity implements Referenceable {}}- public boolean isFieldVisible(String fieldName, String state) {+ public boolean isFieldVisible(String fieldName) {IssueWorkflow workflow = getProject().getIssueWorkflow();InputSpec fieldSpec = workflow.getFieldSpec(fieldName);if (fieldSpec != null) {- if (fieldSpec.getShowConditions() != null) {- for (ShowCondition condition: fieldSpec.getShowConditions()) {- if (condition.getInputName().equals(IssueConstants.FIELD_STATE)) {- if (!condition.getValueMatcher().matches(state))- return false;- } else {- IssueField dependentField = getFields().get(condition.getInputName());- if (dependentField != null) {- String value;- if (!dependentField.getValues().isEmpty())- value = dependentField.getValues().iterator().next();- else- value = null;- if (!condition.getValueMatcher().matches(value))- return false;- } else {- return false;- }- }+ if (fieldSpec.getShowCondition() != null) {+ IssueField dependentField = getFields().get(fieldSpec.getShowCondition().getInputName());+ if (dependentField != null) {+ String value;+ if (!dependentField.getValues().isEmpty())+ value = dependentField.getValues().iterator().next();+ else+ value = null;+ return fieldSpec.getShowCondition().getValueMatcher().matches(value);+ } else {+ return false;}- return true;} else {return true;}diff --git a/core/src/main/java/io/onedev/server/model/Project.java b/core/src/main/java/io/onedev/server/model/Project.javaindex aa31a18822..602357a56d 100644--- a/core/src/main/java/io/onedev/server/model/Project.java+++ b/core/src/main/java/io/onedev/server/model/Project.java@@ -848,13 +848,14 @@ public class Project extends AbstractEntity {public ArrayList<NamedIssueQuery> getSavedIssueQueries() {if (savedIssueQueries == null) {savedIssueQueries = new ArrayList<>();- savedIssueQueries.add(new NamedIssueQuery("Open", "open"));- savedIssueQueries.add(new NamedIssueQuery("My open", "open and mine"));+ savedIssueQueries.add(new NamedIssueQuery("Outstanding", "outstanding"));+ savedIssueQueries.add(new NamedIssueQuery("My outstanding", "outstanding and mine"));savedIssueQueries.add(new NamedIssueQuery("Submitted recently", "\"Submit Date\" is after \"last week\""));savedIssueQueries.add(new NamedIssueQuery("Updated recently", "\"Update Date\" is after \"last week\""));- savedIssueQueries.add(new NamedIssueQuery("Submitted by me", "\"Submitter\" is me"));+ savedIssueQueries.add(new NamedIssueQuery("Submitted by me", "submitted by me"));savedIssueQueries.add(new NamedIssueQuery("Assigned to me", "\"Assignee\" is me"));savedIssueQueries.add(new NamedIssueQuery("High Priority", "\"Priority\" is \"High\""));+ savedIssueQueries.add(new NamedIssueQuery("Unassigned outstanding", "outstanding and \"Assignee\" is empty"));savedIssueQueries.add(new NamedIssueQuery("Closed", "closed"));savedIssueQueries.add(new NamedIssueQuery("All", "all"));}diff --git a/core/src/main/java/io/onedev/server/model/support/issue/IssueBoard.java b/core/src/main/java/io/onedev/server/model/support/issue/IssueBoard.javaindex fd1ec7bcfc..573ee7c918 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/IssueBoard.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/IssueBoard.java@@ -41,7 +41,7 @@ public class IssueBoard implements Serializable {private String baseQuery;- private String backlogBaseQuery = "open";+ private String backlogBaseQuery = "outstanding";private String identifyField;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.javaindex 947b38bab2..8d3d5bd5f1 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@@ -18,7 +18,9 @@ import io.onedev.server.entityquery.issue.OrCriteria;import io.onedev.server.entityquery.issue.StateCriteria;import io.onedev.server.exception.OneException;import io.onedev.server.model.support.authorized.ProjectWriters;-import io.onedev.server.model.support.issue.IssueConstants;+import io.onedev.server.model.support.issue.workflow.transitionprerequisite.TransitionPrerequisite;+import io.onedev.server.model.support.issue.workflow.transitionprerequisite.ValueIsEmpty;+import io.onedev.server.model.support.issue.workflow.transitionprerequisite.ValueIsNotEmpty;import io.onedev.server.model.support.issue.workflow.transitiontrigger.PressButtonTrigger;import io.onedev.server.util.inputspec.InputSpec;import io.onedev.server.util.inputspec.IssueChoiceInput;@@ -29,7 +31,6 @@ import io.onedev.server.util.inputspec.choiceinput.defaultvalueprovider.Specifieimport io.onedev.server.util.inputspec.showcondition.ShowCondition;import io.onedev.server.util.inputspec.showcondition.ValueIsOneOf;import io.onedev.server.util.inputspec.userchoiceinput.UserChoiceInput;-import io.onedev.server.util.inputspec.userchoiceinput.choiceprovider.ProjectReaders;public class IssueWorkflow implements Serializable {@@ -42,7 +43,9 @@ public class IssueWorkflow implements Serializable {private List<TransitionSpec> transitionSpecs = new ArrayList<>();private List<InputSpec> fieldSpecs = new ArrayList<>();-++ private List<String> promptFieldsUponIssueOpen = new ArrayList<>();+private boolean reconciled = true;private transient Map<String, InputSpec> fieldSpecMap;@@ -109,9 +112,7 @@ public class IssueWorkflow implements Serializable {fieldSpecs.add(priority);UserChoiceInput assignee = new UserChoiceInput();- assignee.setAllowEmpty(true);- assignee.setNameOfEmptyValue("No assignee");- assignee.setChoiceProvider(new ProjectReaders());+ assignee.setChoiceProvider(new io.onedev.server.util.inputspec.userchoiceinput.choiceprovider.ProjectWriters());assignee.setName("Assignee");fieldSpecs.add(assignee);@@ -141,38 +142,19 @@ public class IssueWorkflow implements Serializable {specifiedDefaultValue.setValue("Fixed");resolution.setDefaultValueProvider(specifiedDefaultValue);- List<ShowCondition> showConditions = new ArrayList<>();- ShowCondition showCondition = new ShowCondition();- showCondition.setInputName("State");- ValueIsOneOf valueIsOneOf = new ValueIsOneOf();- valueIsOneOf.setValues(Lists.newArrayList("Closed"));- showCondition.setValueMatcher(valueIsOneOf);- showConditions.add(showCondition);- resolution.setShowConditions(showConditions);-fieldSpecs.add(resolution);- IssueChoiceInput duplicateIssue = new IssueChoiceInput();- duplicateIssue.setName("Duplicate With");-- showConditions = new ArrayList<>();- showCondition = new ShowCondition();- showCondition.setInputName("State");- valueIsOneOf = new ValueIsOneOf();- valueIsOneOf.setValues(Lists.newArrayList("Closed"));- showCondition.setValueMatcher(valueIsOneOf);- showConditions.add(showCondition);+ IssueChoiceInput duplicateWith = new IssueChoiceInput();+ duplicateWith.setName("Duplicate With");- showCondition = new ShowCondition();+ ShowCondition showCondition = new ShowCondition();showCondition.setInputName("Resolution");- valueIsOneOf = new ValueIsOneOf();+ ValueIsOneOf valueIsOneOf = new ValueIsOneOf();valueIsOneOf.setValues(Lists.newArrayList("Duplicated"));showCondition.setValueMatcher(valueIsOneOf);- showConditions.add(showCondition);-- duplicateIssue.setShowConditions(showConditions);+ duplicateWith.setShowCondition(showCondition);- fieldSpecs.add(duplicateIssue);+ fieldSpecs.add(duplicateWith);StateSpec open = new StateSpec();open.setName("Open");@@ -181,6 +163,13 @@ public class IssueWorkflow implements Serializable {stateSpecs.add(open);+ StateSpec assigned = new StateSpec();+ assigned.setName("Assigned");+ assigned.setCategory(StateSpec.Category.OPEN);+ assigned.setColor("#9900ff");++ stateSpecs.add(assigned);+StateSpec closed = new StateSpec();closed.setColor("#5cb85c");closed.setName("Closed");@@ -190,10 +179,22 @@ public class IssueWorkflow implements Serializable {TransitionSpec transition = new TransitionSpec();transition.setFromStates(Lists.newArrayList("Open"));- transition.setToState("Closed");+ transition.setToState("Assigned");PressButtonTrigger pressButton = new PressButtonTrigger();- pressButton.setName("Close");+ pressButton.setButtonLabel("Assign");pressButton.setAuthorized(new ProjectWriters());+ pressButton.setPromptFields(Lists.newArrayList("Assignee"));+ transition.setTrigger(pressButton);++ transitionSpecs.add(transition);++ transition = new TransitionSpec();+ transition.setFromStates(Lists.newArrayList("Open", "Assigned"));+ transition.setToState("Closed");+ pressButton = new PressButtonTrigger();+ pressButton.setButtonLabel("Close");+ pressButton.setAuthorized(new ProjectWriters());+ pressButton.setPromptFields(Lists.newArrayList("Resolution", "Duplicate With"));transition.setTrigger(pressButton);transitionSpecs.add(transition);@@ -201,12 +202,33 @@ public class IssueWorkflow implements Serializable {transition = new TransitionSpec();transition.setFromStates(Lists.newArrayList("Closed"));transition.setToState("Open");+ transition.setPrerequisite(new TransitionPrerequisite());+ transition.getPrerequisite().setInputName("Assignee");+ transition.getPrerequisite().setValueMatcher(new ValueIsEmpty());+ pressButton = new PressButtonTrigger();+ pressButton.setButtonLabel("Reopen");+ transition.setRemoveFields(Lists.newArrayList("Resolution", "Duplicate With"));+ pressButton.setAuthorized(new ProjectWriters());+ transition.setTrigger(pressButton);++ transitionSpecs.add(transition);++ transition = new TransitionSpec();+ transition.setFromStates(Lists.newArrayList("Closed"));+ transition.setToState("Assigned");+ transition.setPrerequisite(new TransitionPrerequisite());+ transition.getPrerequisite().setInputName("Assignee");+ transition.getPrerequisite().setValueMatcher(new ValueIsNotEmpty());pressButton = new PressButtonTrigger();- pressButton.setName("Reopen");+ pressButton.setButtonLabel("Reopen");+ transition.setRemoveFields(Lists.newArrayList("Resolution", "Duplicate With"));pressButton.setAuthorized(new ProjectWriters());transition.setTrigger(pressButton);transitionSpecs.add(transition);++ promptFieldsUponIssueOpen.add("Type");+ promptFieldsUponIssueOpen.add("Priority");}public List<StateSpec> getStateSpecs() {@@ -233,6 +255,14 @@ public class IssueWorkflow implements Serializable {this.fieldSpecs = fieldSpecs;}+ public List<String> getPromptFieldsUponIssueOpen() {+ return promptFieldsUponIssueOpen;+ }++ public void setPromptFieldsUponIssueOpen(List<String> promptFieldsUponIssueOpen) {+ this.promptFieldsUponIssueOpen = promptFieldsUponIssueOpen;+ }+public boolean isReconciled() {return reconciled;}@@ -318,10 +348,7 @@ public class IssueWorkflow implements Serializable {@Nullablepublic InputSpec getFieldSpec(String fieldName) {- if (fieldName.equals(IssueConstants.FIELD_STATE))- return getFieldSpecOfState();- else- return getFieldSpecMap().get(fieldName);+ return getFieldSpecMap().get(fieldName);}public int getFieldSpecIndex(String fieldName) {@@ -333,18 +360,21 @@ public class IssueWorkflow implements Serializable {}public void onRenameField(String oldName, String newName) {+ for (int i=0; i<getPromptFieldsUponIssueOpen().size(); i++) {+ if (getPromptFieldsUponIssueOpen().get(i).equals(oldName))+ getPromptFieldsUponIssueOpen().set(i, newName);+ }for (TransitionSpec transition: getTransitionSpecs())- transition.onFieldRename(oldName, newName);+ transition.onRenameField(oldName, newName);for (InputSpec field: getFieldSpecs())field.onRenameInput(oldName, newName);}public void onDeleteField(String fieldName) {for (Iterator<TransitionSpec> it = getTransitionSpecs().iterator(); it.hasNext();) {- if (it.next().onFieldDelete(fieldName))+ if (it.next().onDeleteField(fieldName))it.remove();}-Set<String> deletedFields = new HashSet<>();for (Iterator<InputSpec> it = getFieldSpecs().iterator(); it.hasNext();) {InputSpec field = it.next();@@ -416,21 +446,6 @@ public class IssueWorkflow implements Serializable {throw new OneException("No any issue state is defined");}- public InputSpec getFieldSpecOfState() {- ChoiceInput inputSpec = new ChoiceInput();- inputSpec.setName(IssueConstants.FIELD_STATE);- inputSpec.setAllowEmpty(false);- SpecifiedChoices choicesProvider = new SpecifiedChoices();- for (StateSpec stateSpec: getStateSpecs()) {- Choice choice = new Choice();- choice.setValue(stateSpec.getName());- choice.setColor(stateSpec.getColor());- choicesProvider.getChoices().add(choice);- }- inputSpec.setChoiceProvider(choicesProvider);- return inputSpec;- }-public IssueCriteria getCategoryCriteria(StateSpec.Category category) {List<IssueCriteria> criterias = new ArrayList<>();for (StateSpec state: getStateSpecs()) {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.javaindex f92905bd97..f0880392e4 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@@ -2,6 +2,7 @@ package io.onedev.server.model.support.issue.workflow;import java.io.Serializable;import java.util.ArrayList;+import java.util.Iterator;import java.util.List;import javax.validation.constraints.NotNull;@@ -14,11 +15,11 @@ import io.onedev.server.model.support.authorized.SpecifiedGroup;import io.onedev.server.model.support.authorized.SpecifiedUser;import io.onedev.server.model.support.issue.IssueField;import io.onedev.server.model.support.issue.workflow.transitionprerequisite.TransitionPrerequisite;-import io.onedev.server.model.support.issue.workflow.transitiontrigger.TransitionTrigger;import io.onedev.server.model.support.issue.workflow.transitiontrigger.BuildSuccessfulTrigger;import io.onedev.server.model.support.issue.workflow.transitiontrigger.PressButtonTrigger;import io.onedev.server.model.support.issue.workflow.transitiontrigger.PullRequestTrigger;-import io.onedev.server.security.SecurityUtils;+import io.onedev.server.model.support.issue.workflow.transitiontrigger.TransitionTrigger;+import io.onedev.server.util.inputspec.InputSpec;import io.onedev.server.web.editable.annotation.ChoiceProvider;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.Multiline;@@ -42,6 +43,8 @@ public class TransitionSpec implements Serializable {private TransitionTrigger trigger;+ private List<String> removeFields = new ArrayList<>();+@Editable(order=50)@NameOfEmptyValue("No description")@Multiline@@ -96,6 +99,26 @@ public class TransitionSpec implements Serializable {this.trigger = trigger;}+ @Editable(order=1000, description="Optionally select fields to remove when this transition happens")+ @ChoiceProvider("getFieldChoices")+ @NameOfEmptyValue("No fields to remove")+ public List<String> getRemoveFields() {+ return removeFields;+ }++ public void setRemoveFields(List<String> removeFields) {+ this.removeFields = removeFields;+ }++ @SuppressWarnings("unused")+ private static List<String> getFieldChoices() {+ List<String> fields = new ArrayList<>();+ IssueWorkflowPage page = (IssueWorkflowPage) WicketUtils.getPage();+ for (InputSpec field: page.getWorkflow().getFieldSpecs())+ fields.add(field.getName());+ return fields;+ }+public void onRenameUser(String oldName, String newName) {TransitionTrigger trigger = getTrigger();if (trigger instanceof PressButtonTrigger) {@@ -165,7 +188,7 @@ public class TransitionSpec implements Serializable {return false;}- public void onFieldRename(String oldName, String newName) {+ public void onRenameField(String oldName, String newName) {if (getPrerequisite() != null && getPrerequisite().getInputName().equals(oldName))getPrerequisite().setInputName(newName);if (getTrigger() instanceof BuildSuccessfulTrigger) {@@ -176,10 +199,20 @@ public class TransitionSpec implements Serializable {PullRequestTrigger trigger = (PullRequestTrigger) getTrigger();if (oldName.equals(trigger.getPullRequestField()))trigger.setPullRequestField(newName);+ } else if (getTrigger() instanceof PressButtonTrigger) {+ PressButtonTrigger trigger = (PressButtonTrigger) getTrigger();+ for (int i=0; i<trigger.getPromptFields().size(); i++) {+ if (trigger.getPromptFields().get(i).equals(oldName))+ trigger.getPromptFields().set(i, newName);+ }+ }+ for (int i=0; i<getRemoveFields().size(); i++) {+ if (getRemoveFields().get(i).equals(oldName))+ getRemoveFields().set(i, newName);}}- public boolean onFieldDelete(String fieldName) {+ public boolean onDeleteField(String fieldName) {if (getPrerequisite() != null && getPrerequisite().getInputName().equals(fieldName))return true;if (getTrigger() instanceof BuildSuccessfulTrigger) {@@ -190,7 +223,18 @@ public class TransitionSpec implements Serializable {PullRequestTrigger trigger = (PullRequestTrigger) getTrigger();if (fieldName.equals(trigger.getPullRequestField()))return true;+ } else if (getTrigger() instanceof PressButtonTrigger) {+ PressButtonTrigger trigger = (PressButtonTrigger) getTrigger();+ for (Iterator<String> it = trigger.getPromptFields().iterator(); it.hasNext();) {+ if (it.next().equals(fieldName))+ it.remove();+ }+ }+ for (Iterator<String> it = getRemoveFields().iterator(); it.hasNext();) {+ if (it.next().equals(fieldName))+ it.remove();}+return false;}@@ -208,9 +252,8 @@ public class TransitionSpec implements Serializable {return StringUtils.join(getFromStates()) + "-->" + getToState();}- public boolean canApplyTo(Issue issue) {- if (getFromStates().contains(issue.getState()) && getTrigger().getButton() != null && SecurityUtils.getUser() != null- && getTrigger().getButton().getAuthorized().matches(issue.getProject(), SecurityUtils.getUser())) {+ public boolean canTransite(Issue issue) {+ if (getFromStates().contains(issue.getState())) {if (getPrerequisite() == null) {return true;} else {diff --git a/core/src/main/java/io/onedev/server/model/support/issue/workflow/transitiontrigger/BuildSuccessfulTrigger.java b/core/src/main/java/io/onedev/server/model/support/issue/workflow/transitiontrigger/BuildSuccessfulTrigger.javaindex 25c92f5293..4a07370329 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/workflow/transitiontrigger/BuildSuccessfulTrigger.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/workflow/transitiontrigger/BuildSuccessfulTrigger.java@@ -42,11 +42,6 @@ public class BuildSuccessfulTrigger implements TransitionTrigger {this.buildField = buildField;}- @Override- public Button getButton() {- return null;- }-@SuppressWarnings("unused")private static List<String> getBuildFieldChoices() {List<String> choices = new ArrayList<>();diff --git a/core/src/main/java/io/onedev/server/model/support/issue/workflow/transitiontrigger/Button.java b/core/src/main/java/io/onedev/server/model/support/issue/workflow/transitiontrigger/Button.javadeleted file mode 100644index 22fed4a6c9..0000000000--- a/core/src/main/java/io/onedev/server/model/support/issue/workflow/transitiontrigger/Button.java+++ /dev/null@@ -1,13 +0,0 @@-package io.onedev.server.model.support.issue.workflow.transitiontrigger;--import java.io.Serializable;--import io.onedev.server.model.support.authorized.Authorized;--public interface Button extends Serializable {-- String getName();-- public Authorized getAuthorized();--}diff --git a/core/src/main/java/io/onedev/server/model/support/issue/workflow/transitiontrigger/CommitTrigger.java b/core/src/main/java/io/onedev/server/model/support/issue/workflow/transitiontrigger/CommitTrigger.javaindex f496564bfa..de0e39c219 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/workflow/transitiontrigger/CommitTrigger.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/workflow/transitiontrigger/CommitTrigger.java@@ -7,9 +7,4 @@ public class CommitTrigger implements TransitionTrigger {private static final long serialVersionUID = 1L;- @Override- public Button getButton() {- return null;- }-}diff --git a/core/src/main/java/io/onedev/server/model/support/issue/workflow/transitiontrigger/PressButtonTrigger.java b/core/src/main/java/io/onedev/server/model/support/issue/workflow/transitiontrigger/PressButtonTrigger.javaindex edd7977f25..8222fe748b 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/workflow/transitiontrigger/PressButtonTrigger.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/workflow/transitiontrigger/PressButtonTrigger.java@@ -1,37 +1,46 @@package io.onedev.server.model.support.issue.workflow.transitiontrigger;+import java.util.ArrayList;+import java.util.Iterator;+import java.util.List;+import javax.validation.constraints.NotNull;import org.hibernate.validator.constraints.NotEmpty;import io.onedev.server.model.support.authorized.Authorized;+import io.onedev.server.security.SecurityUtils;+import io.onedev.server.util.inputspec.InputSpec;+import io.onedev.server.web.editable.annotation.ChoiceProvider;import io.onedev.server.web.editable.annotation.Editable;-import io.onedev.server.web.editable.annotation.OmitName;+import io.onedev.server.web.editable.annotation.NameOfEmptyValue;+import io.onedev.server.web.page.project.ProjectPage;+import io.onedev.server.web.page.project.setting.issueworkflow.IssueWorkflowPage;+import io.onedev.server.web.util.WicketUtils;-@Editable(order=100, name="Button")-public class PressButtonTrigger implements TransitionTrigger, Button {+@Editable(order=100, name="Button is pressed")+public class PressButtonTrigger implements TransitionTrigger {private static final long serialVersionUID = 1L;- private String name;+ private String buttonLabel;private Authorized authorized;+ private List<String> promptFields;+@Editable(order=100)@NotEmpty- @OmitName- @Override- public String getName() {- return name;+ public String getButtonLabel() {+ return buttonLabel;}- public void setName(String name) {- this.name = name;+ public void setButtonLabel(String buttonLabel) {+ this.buttonLabel = buttonLabel;}- @Editable(order=200, name="Is pressed by")+ @Editable(order=200, name="Authorization")@NotNull(message="may not be empty")- @Overridepublic Authorized getAuthorized() {return authorized;}@@ -40,9 +49,43 @@ public class PressButtonTrigger implements TransitionTrigger, Button {this.authorized = authorized;}- @Override- public Button getButton() {- return this;+ @Editable(order=500, description="Optionally select fields to prompt when this button is pressed")+ @ChoiceProvider("getFieldChoices")+ @NameOfEmptyValue("No fields to prompt")+ public List<String> getPromptFields() {+ return promptFields;+ }++ public void setPromptFields(List<String> promptFields) {+ this.promptFields = promptFields;+ }++ @SuppressWarnings("unused")+ private static List<String> getFieldChoices() {+ List<String> fields = new ArrayList<>();+ IssueWorkflowPage page = (IssueWorkflowPage) WicketUtils.getPage();+ for (InputSpec field: page.getWorkflow().getFieldSpecs())+ fields.add(field.getName());+ return fields;}+ public void onRenameField(String oldName, String newName) {+ for (int i=0; i<getPromptFields().size(); i++) {+ if (getPromptFields().get(i).equals(oldName))+ getPromptFields().set(i, newName);+ }+ }++ public void onDeleteField(String fieldName) {+ for (Iterator<String> it = getPromptFields().iterator(); it.hasNext();) {+ if (it.next().equals(fieldName))+ it.remove();+ }+ }++ public boolean isAuthorized() {+ ProjectPage page = (ProjectPage) WicketUtils.getPage();+ return SecurityUtils.getUser() != null && getAuthorized().matches(page.getProject(), SecurityUtils.getUser());+ }+}diff --git a/core/src/main/java/io/onedev/server/model/support/issue/workflow/transitiontrigger/PullRequestTrigger.java b/core/src/main/java/io/onedev/server/model/support/issue/workflow/transitiontrigger/PullRequestTrigger.javaindex 1b02f17d6c..20d0299ce5 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/workflow/transitiontrigger/PullRequestTrigger.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/workflow/transitiontrigger/PullRequestTrigger.java@@ -31,11 +31,6 @@ public abstract class PullRequestTrigger implements TransitionTrigger {this.branch = branch;}- @Override- public Button getButton() {- return null;- }-@Editable(order=200, description="Optionally specify an issue field of \"pull request choice\" type to store the pull request information")@ChoiceProvider("getPullRequestFieldChoices")public String getPullRequestField() {diff --git a/core/src/main/java/io/onedev/server/model/support/issue/workflow/transitiontrigger/TransitionTrigger.java b/core/src/main/java/io/onedev/server/model/support/issue/workflow/transitiontrigger/TransitionTrigger.javaindex c83ec6f251..bd85c942be 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/workflow/transitiontrigger/TransitionTrigger.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/workflow/transitiontrigger/TransitionTrigger.java@@ -2,14 +2,9 @@ package io.onedev.server.model.support.issue.workflow.transitiontrigger;import java.io.Serializable;-import javax.annotation.Nullable;-import io.onedev.server.web.editable.annotation.Editable;@Editablepublic interface TransitionTrigger extends Serializable {- @Nullable- Button getButton();-}diff --git a/core/src/main/java/io/onedev/server/security/permission/ProjectPrivilege.java b/core/src/main/java/io/onedev/server/security/permission/ProjectPrivilege.javanew file mode 100644index 0000000000..54a2c06b13--- /dev/null+++ b/core/src/main/java/io/onedev/server/security/permission/ProjectPrivilege.java@@ -0,0 +1,75 @@+package io.onedev.server.security.permission;++public enum ProjectPrivilege {++ ReadCode("Read code") {++ @Override+ public boolean implies(ProjectPrivilege privilege) {+ return privilege == ReadCode;+ }++ },+ WriteCode("Write code") {++ @Override+ public boolean implies(ProjectPrivilege privilege) {+ return privilege == WriteCode || ReadCode.implies(privilege);+ }++ },+ ReadIssues("Read issues") {++ @Override+ public boolean implies(ProjectPrivilege privilege) {+ return privilege == ReadIssues;+ }++ },+ CreateIssues("Create issues") {++ @Override+ public boolean implies(ProjectPrivilege privilege) {+ return privilege == CreateIssues || ReadIssues.implies(privilege);+ }++ },+ EditIssues("Edit issues") {++ @Override+ public boolean implies(ProjectPrivilege privilege) {+ return privilege == EditIssues || CreateIssues.implies(privilege);+ }++ },+ DeleteIssues("Delete issues") {++ @Override+ public boolean implies(ProjectPrivilege privilege) {+ return privilege == DeleteIssues || EditIssues.implies(privilege);+ }++ },+ ProjectAdministration("Project Administration") {++ @Override+ public boolean implies(ProjectPrivilege privilege) {+ return true;+ }++ };++ public abstract boolean implies(ProjectPrivilege privilege);++ private final String displayName;++ ProjectPrivilege(String displayName) {+ this.displayName = displayName;+ }++ @Override+ public String toString() {+ return displayName;+ }++}diff --git a/core/src/main/java/io/onedev/server/util/IssueUtils.java b/core/src/main/java/io/onedev/server/util/IssueUtils.javaindex 1d74b4f35f..d5bf5079d1 100644--- a/core/src/main/java/io/onedev/server/util/IssueUtils.java+++ b/core/src/main/java/io/onedev/server/util/IssueUtils.java@@ -4,7 +4,6 @@ import java.io.Serializable;import java.util.Collection;import java.util.HashMap;import java.util.HashSet;-import java.util.List;import java.util.Map;import java.util.Set;import java.util.StringTokenizer;@@ -12,14 +11,11 @@ import java.util.StringTokenizer;import javax.annotation.Nullable;import com.google.common.base.Splitter;-import com.google.common.collect.Lists;import com.google.common.collect.Sets;import io.onedev.server.OneDev;-import io.onedev.server.exception.OneException;import io.onedev.server.manager.ProjectManager;import io.onedev.server.model.Project;-import io.onedev.server.model.support.issue.IssueConstants;import io.onedev.server.model.support.issue.workflow.IssueWorkflow;import io.onedev.server.util.inputspec.InputSpec;import io.onedev.server.web.editable.BeanDescriptor;@@ -40,9 +36,7 @@ public class IssueUtils {public static Class<? extends Serializable> defineBeanClass(Project project) {String className = BEAN_PREFIX + project.getId();IssueWorkflow workflow = project.getIssueWorkflow();- List<InputSpec> fieldSpecs = Lists.newArrayList(workflow.getFieldSpecOfState());- fieldSpecs.addAll(workflow.getFieldSpecs());- return (Class<? extends Serializable>) InputSpec.defineClass(className, fieldSpecs);+ return (Class<? extends Serializable>) InputSpec.defineClass(className, workflow.getFieldSpecs());}@Nullable@@ -56,26 +50,6 @@ public class IssueUtils {}}- public static void setState(Serializable fieldBean, String state) {- setFieldValue(fieldBean, IssueConstants.FIELD_STATE, state);- }-- @Nullable- public static Object getFieldValue(Serializable fieldBean, String fieldName) {- for (PropertyDescriptor property: new BeanDescriptor(fieldBean.getClass()).getPropertyDescriptors()) {- if (fieldName.equals(property.getDisplayName()))- return property.getPropertyValue(fieldBean);- }- throw new OneException("Unable to find property for field: " + fieldName);- }-- public static void setFieldValue(Serializable fieldBean, String fieldName, Object fieldValue) {- for (PropertyDescriptor property: new BeanDescriptor(fieldBean.getClass()).getPropertyDescriptors()) {- if (property.getDisplayName().equals(fieldName))- property.setPropertyValue(fieldBean, fieldValue);- }- }-public static Collection<String> getPropertyNames(Class<?> fieldBeanClass, Collection<String> fieldNames) {Collection<String> propertyNames = new HashSet<>();for (PropertyDescriptor property: new BeanDescriptor(fieldBeanClass).getPropertyDescriptors()) {@@ -85,11 +59,13 @@ public class IssueUtils {return propertyNames;}- public static Map<String, Object> getFieldValues(Serializable fieldBean) {+ 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())- fieldValues.put(propertyDescriptor.getDisplayName(), propertyDescriptor.getPropertyValue(fieldBean));+ for (PropertyDescriptor propertyDescriptor: beanDescriptor.getPropertyDescriptors()) {+ if (fieldNames.contains(propertyDescriptor.getDisplayName()))+ fieldValues.put(propertyDescriptor.getDisplayName(), propertyDescriptor.getPropertyValue(fieldBean));+ }return fieldValues;}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 364bd804ad..5e0d7b035a 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@@ -1,9 +1,7 @@package io.onedev.server.util.inputspec;import java.io.Serializable;-import java.util.ArrayList;import java.util.HashMap;-import java.util.Iterator;import java.util.List;import java.util.Map;@@ -25,8 +23,6 @@ import io.onedev.server.web.editable.EditableUtils;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.Multiline;import io.onedev.server.web.editable.annotation.NameOfEmptyValue;-import io.onedev.server.web.page.project.setting.issueworkflow.fields.ShowConditionListWrapper;-import io.onedev.server.web.page.project.setting.issueworkflow.fields.ShowConditionOuterWrapper;@Editablepublic abstract class InputSpec implements Serializable {@@ -69,10 +65,7 @@ public abstract class InputSpec implements Serializable {private String nameOfEmptyValue;- private List<ShowCondition> showConditions;-- // Added to edit/view show conditions in a user-friendly way- private transient ShowConditionListWrapper showConditionListWrapper;+ private ShowCondition showCondition;@Editable(order=10)@InputName@@ -105,22 +98,14 @@ public abstract class InputSpec implements Serializable {this.allowMultiple = allowMultiple;}- public List<ShowCondition> getShowConditions() {- return showConditions;- }-- public void setShowConditions(List<ShowCondition> showConditions) {- this.showConditions = showConditions;- }-@Editable(order=40, name="Show Conditionally", description="resource.input.showCondition")@NameOfEmptyValue("Always")- public ShowConditionListWrapper getShowConditionListWrapper() {- return showConditionListWrapper;+ public ShowCondition getShowCondition() {+ return showCondition;}- public void setShowConditionListWrapper(ShowConditionListWrapper showConditionListWrapper) {- this.showConditionListWrapper = showConditionListWrapper;+ public void setShowCondition(ShowCondition showCondition) {+ this.showCondition = showCondition;}@Editable(order=50, name="Allow Empty Value", description="resource.input.allowEmpty")@@ -188,7 +173,7 @@ public abstract class InputSpec implements Serializable {buffer.append(" @Editable(name=\"" + escape(name) +"\", order=" + index + ")\n");}- if (showConditions != null)+ if (showCondition != null)buffer.append(" @ShowCondition(\"isInput" + index + "Visible\")\n");if (getNameOfEmptyValue() != null)buffer.append(" @NameOfEmptyValue(\"" + escape(getNameOfEmptyValue()) + "\")");@@ -214,14 +199,10 @@ public abstract class InputSpec implements Serializable {buffer.append(" }\n");buffer.append("\n");- if (showConditions != null) {+ if (showCondition != null) {buffer.append(" private static boolean isInput" + index + "Visible() {\n");- literalBytes = getLiteral(SerializationUtils.serialize((Serializable) showConditions));- buffer.append(" for (condition in SerializationUtils.deserialize(" + literalBytes + ")) {\n");- buffer.append(" if (!condition.isVisible())\n");- buffer.append(" return false;\n");- buffer.append(" }\n");- buffer.append(" return true;\n");+ literalBytes = getLiteral(SerializationUtils.serialize(showCondition));+ buffer.append(" return SerializationUtils.deserialize(" + literalBytes + ").isVisible();\n");buffer.append(" }\n");buffer.append("\n");}@@ -239,47 +220,16 @@ public abstract class InputSpec implements Serializable {}}- public void setupShowConditionsForDisplay() {- if (showConditions != null) {- showConditionListWrapper = new ShowConditionListWrapper();- for (ShowCondition condition: showConditions) {- ShowConditionOuterWrapper outerWrapper = new ShowConditionOuterWrapper();- outerWrapper.getInnerWrapper().setCondition(condition);- showConditionListWrapper.getOuterWrappers().add(outerWrapper);- }- } else {- showConditionListWrapper = null;- }- }-- public void setupShowConditionsForStorage() {- if (showConditionListWrapper != null) {- showConditions = new ArrayList<>();- for (ShowConditionOuterWrapper outerWrapper: showConditionListWrapper.getOuterWrappers())- showConditions.add(outerWrapper.getInnerWrapper().getCondition());- } else {- showConditions = null;- }- }-public void onRenameInput(String oldName, String newName) {- if (showConditions != null) {- for (ShowCondition condition: showConditions) {- if (oldName.equals(condition.getInputName()))- condition.setInputName(newName);- }+ if (showCondition != null) {+ if (oldName.equals(showCondition.getInputName()))+ showCondition.setInputName(newName);}}public boolean onDeleteInput(String inputName) {- if (showConditions != null) {- for (Iterator<ShowCondition> it = showConditions.iterator(); it.hasNext();) {- if (inputName.equals(it.next().getInputName()))- it.remove();- }- if (showConditions.isEmpty())- showConditions = null;- }+ if (showCondition != null && showCondition.getInputName().equals(inputName))+ showCondition = null;return false;}diff --git a/core/src/main/java/io/onedev/server/web/component/diff/table/diff-table.css b/core/src/main/java/io/onedev/server/web/component/diff/table/diff-table.cssindex 6d90711c17..39d62ff319 100644--- a/core/src/main/java/io/onedev/server/web/component/diff/table/diff-table.css+++ b/core/src/main/java/io/onedev/server/web/component/diff/table/diff-table.css@@ -114,6 +114,10 @@ table.diff>tbody>tr.expanded>td {table.diff>tbody>tr:hover>td {background: #E8F2FE !important;}-table.plain.diff>tbody>tr.code>td {- padding: 4px 8px;+table.plain.diff {+ border: none;+}+table.plain.diff>tbody>tr>td {+ padding: 0 12px 6px 0;+ background: white !important;}diff --git a/core/src/main/java/io/onedev/server/web/component/issuelist/BatchEditPanel.html b/core/src/main/java/io/onedev/server/web/component/issuelist/BatchEditPanel.htmlindex 6a0b798348..277402f536 100644--- a/core/src/main/java/io/onedev/server/web/component/issuelist/BatchEditPanel.html+++ b/core/src/main/java/io/onedev/server/web/component/issuelist/BatchEditPanel.html@@ -10,6 +10,13 @@<label class="control-label">Fields to Change</label><div class="checkboxes clearfix"><div wicket:id="feedback"></div>+ <div class="pull-left">+ <div class="checkbox">+ <label>+ <input wicket:id="stateCheck" type="checkbox"> State+ </label>+ </div>+ </div><div class="pull-left"><div class="checkbox"><label>diff --git a/core/src/main/java/io/onedev/server/web/component/issuelist/BatchEditPanel.java b/core/src/main/java/io/onedev/server/web/component/issuelist/BatchEditPanel.javaindex 3205554f89..39c93815f1 100644--- a/core/src/main/java/io/onedev/server/web/component/issuelist/BatchEditPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/issuelist/BatchEditPanel.java@@ -92,6 +92,27 @@ abstract class BatchEditPanel extends Panel implements InputContext {form.add(new NotificationPanel("feedback", form));+ form.add(new CheckBox("stateCheck", new IModel<Boolean>() {++ @Override+ public void detach() {+ }++ @Override+ public Boolean getObject() {+ return selectedFields.contains(IssueConstants.FIELD_STATE);+ }++ @Override+ public void setObject(Boolean object) {+ if (object)+ selectedFields.add(IssueConstants.FIELD_STATE);+ else+ selectedFields.remove(IssueConstants.FIELD_STATE);+ }++ }).add(newOnChangeBehavior(form)));+form.add(new CheckBox("milestoneCheck", new IModel<Boolean>() {@Override@@ -113,8 +134,7 @@ abstract class BatchEditPanel extends Panel implements InputContext {}).add(newOnChangeBehavior(form)));- List<String> customFieldNames = Lists.newArrayList(IssueConstants.FIELD_STATE);- customFieldNames.addAll(getProject().getIssueWorkflow().getFieldNames());+ List<String> customFieldNames = getProject().getIssueWorkflow().getFieldNames();form.add(new ListView<String>("customFields", customFieldNames) {@Override@@ -162,10 +182,12 @@ abstract class BatchEditPanel extends Panel implements InputContext {}Set<String> excludedProperties = new HashSet<>();+ if (!selectedFields.contains(IssueConstants.FIELD_STATE))+ excludedProperties.add(IssueConstants.ATTR_STATE);if (!selectedFields.contains(IssueConstants.FIELD_MILESTONE))excludedProperties.add(IssueConstants.ATTR_MILESTONE);- builtInFieldsEditor = BeanContext.editBean("builtInFieldsEditor", builtInFieldsBean, excludedProperties);+ builtInFieldsEditor = BeanContext.editBean("builtInFieldsEditor", builtInFieldsBean, excludedProperties, true);form.add(builtInFieldsEditor);excludedProperties = new HashSet<>();@@ -174,7 +196,7 @@ abstract class BatchEditPanel extends Panel implements InputContext {excludedProperties.add(property.getPropertyName());}- customFieldsEditor = BeanContext.editBean("customFieldsEditor", customFieldsBean, excludedProperties);+ customFieldsEditor = BeanContext.editBean("customFieldsEditor", customFieldsBean, excludedProperties, true);form.add(customFieldsEditor);form.add(new CommentInput("comment", new PropertyModel<String>(this, "comment"), false) {@@ -207,15 +229,19 @@ abstract class BatchEditPanel extends Panel implements InputContext {@Overrideprotected void runTask(AjaxRequestTarget target) {+ String state;+ if (selectedFields.contains(IssueConstants.FIELD_STATE))+ state = builtInFieldsBean.getState();+ else+ state = null;+Optional<Milestone> milestone;if (selectedFields.contains(IssueConstants.FIELD_MILESTONE))milestone = Optional.fromNullable(getProject().getMilestone(builtInFieldsBean.getMilestone()));elsemilestone = null;- String state = (String) IssueUtils.getFieldValue(customFieldsBean, IssueConstants.FIELD_STATE);- Map<String, Object> fieldValues = IssueUtils.getFieldValues(customFieldsBean);- fieldValues.keySet().retainAll(selectedFields);+ Map<String, Object> fieldValues = IssueUtils.getFieldValues(customFieldsBean, selectedFields);OneDev.getInstance(IssueActionManager.class).batchUpdate(getIssueIterator(), state, milestone, fieldValues, comment);diff --git a/core/src/main/java/io/onedev/server/web/component/issuelist/BuiltInFieldsBean.java b/core/src/main/java/io/onedev/server/web/component/issuelist/BuiltInFieldsBean.javaindex da1c3fa911..a9ced0842d 100644--- a/core/src/main/java/io/onedev/server/web/component/issuelist/BuiltInFieldsBean.java+++ b/core/src/main/java/io/onedev/server/web/component/issuelist/BuiltInFieldsBean.java@@ -4,6 +4,8 @@ import java.io.Serializable;import java.util.List;import java.util.stream.Collectors;+import org.hibernate.validator.constraints.NotEmpty;+import io.onedev.server.util.OneContext;import io.onedev.server.web.editable.annotation.ChoiceProvider;import io.onedev.server.web.editable.annotation.Editable;@@ -14,8 +16,21 @@ public class BuiltInFieldsBean implements Serializable {private static final long serialVersionUID = 1L;+ private String state;+private String milestone;+ @Editable(order=100)+ @ChoiceProvider("getStateChoices")+ @NotEmpty+ public String getState() {+ return state;+ }++ public void setState(String state) {+ this.state = state;+ }+@Editable(order=200)@ChoiceProvider("getMilestoneChoices")@NameOfEmptyValue("No milestone")@@ -27,8 +42,14 @@ public class BuiltInFieldsBean implements Serializable {this.milestone = milestone;}+ @SuppressWarnings("unused")+ private static List<String> getStateChoices() {+ return OneContext.get().getProject().getIssueWorkflow().getStateSpecs().stream().map(it->it.getName()).collect(Collectors.toList());+ }+@SuppressWarnings("unused")private static List<String> getMilestoneChoices() {return OneContext.get().getProject().getMilestones().stream().map(it->it.getName()).collect(Collectors.toList());}+}diff --git a/core/src/main/java/io/onedev/server/web/component/issuelist/IssueListPanel.java b/core/src/main/java/io/onedev/server/web/component/issuelist/IssueListPanel.javaindex 100a2bca7f..6f785acc1e 100644--- a/core/src/main/java/io/onedev/server/web/component/issuelist/IssueListPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/issuelist/IssueListPanel.java@@ -581,7 +581,7 @@ public abstract class IssueListPanel extends GenericPanel<String> {@Overrideprotected IssueField getField() {Issue issue = rowModel.getObject();- if (issue.isFieldVisible(field, issue.getState()))+ if (issue.isFieldVisible(field))return issue.getFields().get(field);elsereturn null;diff --git a/core/src/main/java/io/onedev/server/web/component/newissue/NewIssueEditor.java b/core/src/main/java/io/onedev/server/web/component/newissue/NewIssueEditor.javaindex 973d090a03..84ad773aa2 100644--- a/core/src/main/java/io/onedev/server/web/component/newissue/NewIssueEditor.java+++ b/core/src/main/java/io/onedev/server/web/component/newissue/NewIssueEditor.java@@ -18,12 +18,9 @@ import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.model.Model;import org.apache.wicket.util.convert.ConversionException;-import com.google.common.collect.Sets;-import io.onedev.server.entityquery.issue.IssueCriteria;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;-import io.onedev.server.model.support.issue.IssueConstants;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.IssueUtils;import io.onedev.server.util.inputspec.InputContext;@@ -100,8 +97,9 @@ public abstract class NewIssueEditor extends FormComponentPanel<Issue> implementmilestoneChoice.setRequired(false);add(milestoneChoice);- Collection<String> excludedProperties = IssueUtils.getPropertyNames(fieldBeanClass, Sets.newHashSet(IssueConstants.FIELD_STATE));- add(fieldEditor = new BeanContext(fieldBean.getClass(), excludedProperties).renderForEdit("fields", Model.of(fieldBean)));+ Collection<String> properties = IssueUtils.getPropertyNames(fieldBeanClass,+ getProject().getIssueWorkflow().getPromptFieldsUponIssueOpen());+ add(fieldEditor = new BeanContext(fieldBean.getClass(), properties, false).renderForEdit("fields", Model.of(fieldBean)));}protected abstract Project getProject();@@ -151,7 +149,8 @@ public abstract class NewIssueEditor extends FormComponentPanel<Issue> implementissue.setDescription(descriptionInput.getConvertedInput());issue.setMilestone(getProject().getMilestone(milestoneChoice.getConvertedInput()));- issue.setFieldValues(IssueUtils.getFieldValues(fieldEditor.getConvertedInput()));+ Collection<String> fieldNames = getProject().getIssueWorkflow().getPromptFieldsUponIssueOpen();+ issue.setFieldValues(IssueUtils.getFieldValues(fieldEditor.getConvertedInput(), fieldNames));setConvertedInput(issue);} catch (ConversionException e) {error(newValidationError(e));diff --git a/core/src/main/java/io/onedev/server/web/component/wizard/ManualConfigStep.java b/core/src/main/java/io/onedev/server/web/component/wizard/ManualConfigStep.javaindex 931571baab..3884ac2e71 100644--- a/core/src/main/java/io/onedev/server/web/component/wizard/ManualConfigStep.java+++ b/core/src/main/java/io/onedev/server/web/component/wizard/ManualConfigStep.java@@ -18,7 +18,7 @@ public class ManualConfigStep implements WizardStep {@Overridepublic FormComponent<Serializable> render(String componentId) {- return BeanContext.editBean(componentId, config.getSetting(), config.getExcludeProperties());+ return BeanContext.editBean(componentId, config.getSetting(), config.getExcludeProperties(), true);}@Overridediff --git a/core/src/main/java/io/onedev/server/web/editable/BeanContext.java b/core/src/main/java/io/onedev/server/web/editable/BeanContext.javaindex 647ac63d0c..651007f159 100644--- a/core/src/main/java/io/onedev/server/web/editable/BeanContext.java+++ b/core/src/main/java/io/onedev/server/web/editable/BeanContext.java@@ -20,11 +20,11 @@ public class BeanContext implements Serializable {private final BeanDescriptor descriptor;public BeanContext(Class<?> beanClass) {- descriptor = new BeanDescriptor(beanClass, Sets.newHashSet());+ descriptor = new BeanDescriptor(beanClass, Sets.newHashSet(), true);}- public BeanContext(Class<?> beanClass, Collection<String> excludedProperties) {- descriptor = new BeanDescriptor(beanClass, excludedProperties);+ public BeanContext(Class<?> beanClass, Collection<String> properties, boolean excluded) {+ descriptor = new BeanDescriptor(beanClass, properties, excluded);}public BeanContext(BeanDescriptor descriptor) {@@ -75,23 +75,23 @@ public class BeanContext implements Serializable {}public static BeanEditor editModel(String componentId, IModel<? extends Serializable> beanModel) {- return editModel(componentId, beanModel, Sets.newHashSet());+ return editModel(componentId, beanModel, Sets.newHashSet(), true);}@SuppressWarnings("unchecked")public static BeanEditor editModel(String componentId,- IModel<? extends Serializable> beanModel, Set<String> excludedProperties) {+ IModel<? extends Serializable> beanModel, Set<String> properties, boolean excluded) {Class<?> beanClass = ClassUtils.unproxy(beanModel.getObject().getClass());- BeanContext beanContext = new BeanContext(beanClass, excludedProperties);+ BeanContext beanContext = new BeanContext(beanClass, properties, excluded);return beanContext.renderForEdit(componentId, (IModel<Serializable>)beanModel);}public static BeanEditor editBean(String componentId, Serializable bean) {- return editBean(componentId, bean, Sets.newHashSet());+ return editBean(componentId, bean, Sets.newHashSet(), true);}public static BeanEditor editBean(String componentId, final Serializable bean,- Collection<String> excludedProperties) {+ Collection<String> properties, boolean excluded) {IModel<Serializable> beanModel = new IModel<Serializable>() {@Override@@ -110,27 +110,27 @@ public class BeanContext implements Serializable {};Class<?> beanClass = ClassUtils.unproxy(beanModel.getObject().getClass());- BeanContext beanContext = new BeanContext(beanClass, excludedProperties);+ BeanContext beanContext = new BeanContext(beanClass, properties, excluded);beanModel = beanContext.wrapAsSelfUpdating(beanModel);return beanContext.renderForEdit(componentId, beanModel);}public static Component viewModel(String componentId, IModel<Serializable> beanModel) {- return viewModel(componentId, beanModel, new HashSet<>());+ return viewModel(componentId, beanModel, new HashSet<>(), true);}public static Component viewModel(String componentId, IModel<Serializable> beanModel,- Set<String> excludedProperties) {- BeanContext editContext = new BeanContext(beanModel.getObject().getClass(), excludedProperties);+ Set<String> properties, boolean excluded) {+ BeanContext editContext = new BeanContext(beanModel.getObject().getClass(), properties, excluded);return editContext.renderForView(componentId, beanModel);}- public static Component viewBean(String componentId, Serializable bean, Set<String> excludedProperties) {- return viewModel(componentId, Model.of(bean), excludedProperties);+ public static Component viewBean(String componentId, Serializable bean, Set<String> properties, boolean excluded) {+ return viewModel(componentId, Model.of(bean), properties, excluded);}public static Component viewBean(String componentId, Serializable bean) {- return viewBean(componentId, bean, new HashSet<>());+ return viewBean(componentId, bean, new HashSet<>(), true);}}diff --git a/core/src/main/java/io/onedev/server/web/editable/BeanDescriptor.java b/core/src/main/java/io/onedev/server/web/editable/BeanDescriptor.javaindex 2b1d278212..6a794540d0 100644--- a/core/src/main/java/io/onedev/server/web/editable/BeanDescriptor.java+++ b/core/src/main/java/io/onedev/server/web/editable/BeanDescriptor.java@@ -24,10 +24,10 @@ public class BeanDescriptor implements Serializable {protected final List<PropertyDescriptor> propertyDescriptors;public BeanDescriptor(Class<?> beanClass) {- this(beanClass, Sets.newHashSet());+ this(beanClass, Sets.newHashSet(), true);}- public BeanDescriptor(Class<?> beanClass, Collection<String> excludedProperties) {+ public BeanDescriptor(Class<?> beanClass, Collection<String> properties, boolean excluded) {this.beanClass = beanClass;propertyDescriptors = new ArrayList<>();@@ -40,7 +40,9 @@ public class BeanDescriptor implements Serializable {PropertyDescriptor propertyDescriptor = new PropertyDescriptor(propertyGetter);propertyDescriptors.add(propertyDescriptor);String propertyName = BeanUtils.getPropertyName(propertyGetter);- propertyDescriptor.setPropertyExcluded(BeanUtils.findSetter(propertyGetter) == null || excludedProperties.contains(propertyName));+ propertyDescriptor.setPropertyExcluded(BeanUtils.findSetter(propertyGetter) == null+ || properties.contains(propertyName) && excluded+ || !properties.contains(propertyName) && !excluded);}}}diff --git a/core/src/main/java/io/onedev/server/web/editable/bool/BooleanEditSupport.java b/core/src/main/java/io/onedev/server/web/editable/bool/BooleanEditSupport.javaindex f2282ff8d1..119c3086a1 100644--- a/core/src/main/java/io/onedev/server/web/editable/bool/BooleanEditSupport.java+++ b/core/src/main/java/io/onedev/server/web/editable/bool/BooleanEditSupport.java@@ -13,6 +13,7 @@ import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;import io.onedev.server.web.editable.PropertyViewer;import io.onedev.server.web.editable.annotation.NameOfEmptyValue;+import io.onedev.utils.StringUtils;@SuppressWarnings("serial")public class BooleanEditSupport implements EditSupport {@@ -32,7 +33,7 @@ public class BooleanEditSupport implements EditSupport {@Overrideprotected Component newContent(String id, PropertyDescriptor propertyDescriptor) {if (model.getObject() != null) {- return new Label(id, model.getObject().toString());+ return new Label(id, StringUtils.describe(model.getObject()));} else {NameOfEmptyValue nameOfEmptyValue = propertyDescriptor.getPropertyGetter().getAnnotation(NameOfEmptyValue.class);if (nameOfEmptyValue != null)diff --git a/core/src/main/java/io/onedev/server/web/page/group/GroupProfilePage.java b/core/src/main/java/io/onedev/server/web/page/group/GroupProfilePage.javaindex 2a0429e029..7165fbadb9 100644--- a/core/src/main/java/io/onedev/server/web/page/group/GroupProfilePage.java+++ b/core/src/main/java/io/onedev/server/web/page/group/GroupProfilePage.java@@ -64,7 +64,7 @@ public class GroupProfilePage extends GroupPage {editor.getBeanDescriptor().copyProperties(object, getGroup());}- }, Sets.newHashSet("administrator", "canCreateProjects"));+ }, Sets.newHashSet("administrator", "canCreateProjects"), true);Form<?> form = new Form<Void>("form") {diff --git a/core/src/main/java/io/onedev/server/web/page/group/NewGroupPage.java b/core/src/main/java/io/onedev/server/web/page/group/NewGroupPage.javaindex 283e23875a..1b7c43e5ce 100644--- a/core/src/main/java/io/onedev/server/web/page/group/NewGroupPage.java+++ b/core/src/main/java/io/onedev/server/web/page/group/NewGroupPage.java@@ -42,7 +42,7 @@ public class NewGroupPage extends LayoutPage {super.onInitialize();BeanEditor editor = BeanContext.editBean("editor", group,- Sets.newHashSet("administrator", "canCreateProjects"));+ Sets.newHashSet("administrator", "canCreateProjects"), true);Form<?> form = new Form<Void>("form") {diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BoardColumnPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BoardColumnPanel.javaindex fce67a19a6..d02124b257 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BoardColumnPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BoardColumnPanel.java@@ -1,12 +1,11 @@package io.onedev.server.web.page.project.issues.issueboards;import java.util.ArrayList;-import java.util.Collection;import java.util.HashMap;-import java.util.Iterator;import java.util.List;import java.util.Map;import java.util.Objects;+import java.util.concurrent.atomic.AtomicReference;import javax.annotation.Nullable;@@ -46,6 +45,7 @@ import io.onedev.server.model.support.issue.IssueBoard;import io.onedev.server.model.support.issue.IssueConstants;import io.onedev.server.model.support.issue.workflow.IssueWorkflow;import io.onedev.server.model.support.issue.workflow.TransitionSpec;+import io.onedev.server.model.support.issue.workflow.transitiontrigger.PressButtonTrigger;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.EditContext;import io.onedev.server.util.OneContext;@@ -132,7 +132,10 @@ abstract class BoardColumnPanel extends Panel implements EditContext {if (identifyField.equals(IssueConstants.FIELD_STATE)) {issue = SerializationUtils.clone(issue);for (TransitionSpec transition: workflow.getTransitionSpecs()) {- if (transition.canApplyTo(issue) && transition.getToState().equals(getColumn())) {+ if (transition.canTransite(issue)+ && transition.getTrigger() instanceof PressButtonTrigger+ && ((PressButtonTrigger)transition.getTrigger()).isAuthorized()+ && transition.getToState().equals(getColumn())) {issue.setState(getColumn());break;}@@ -331,24 +334,21 @@ abstract class BoardColumnPanel extends Panel implements EditContext {checkMatched(target, issue);} else if (fieldName.equals(IssueConstants.FIELD_STATE)) {IssueWorkflow workflow = getProject().getIssueWorkflow();- boolean canTransiteIssue = false;+ AtomicReference<TransitionSpec> transitionRef = new AtomicReference<>(null);for (TransitionSpec transition: workflow.getTransitionSpecs()) {- if (transition.canApplyTo(issue) && transition.getToState().equals(getColumn())) {- canTransiteIssue = true;+ if (transition.canTransite(issue)+ && transition.getTrigger() instanceof PressButtonTrigger+ && ((PressButtonTrigger)transition.getTrigger()).isAuthorized()+ && transition.getToState().equals(getColumn())) {+ transitionRef.set(transition);break;}}- if (!canTransiteIssue)+ if (transitionRef.get() == null)throw new UnauthorizedException("Permission denied");- Collection<String> fieldNames = workflow.getFieldNames();- for (Iterator<String> it = fieldNames.iterator(); it.hasNext();) {- String each = it.next();- if (issue.isFieldVisible(each, issue.getState()) || !issue.isFieldVisible(each, getColumn()))- it.remove();- }-- if (!fieldNames.isEmpty()) {+ PressButtonTrigger trigger = (PressButtonTrigger) transitionRef.get().getTrigger();+ if (!trigger.getPromptFields().isEmpty()) {new ModalPanel(target) {@Override@@ -374,8 +374,8 @@ abstract class BoardColumnPanel extends Panel implements EditContext {}@Override- protected String getTargetState() {- return getColumn();+ protected TransitionSpec getTransition() {+ return transitionRef.get();}};diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/CardDetailPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/CardDetailPanel.javaindex 1363ab00cf..c723b66d5c 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/CardDetailPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/CardDetailPanel.java@@ -1,6 +1,11 @@package io.onedev.server.web.page.project.issues.issueboards;-import static io.onedev.server.model.support.issue.IssueConstants.*;+import static io.onedev.server.model.support.issue.IssueConstants.FIELD_COMMENT_COUNT;+import static io.onedev.server.model.support.issue.IssueConstants.FIELD_MILESTONE;+import static io.onedev.server.model.support.issue.IssueConstants.FIELD_STATE;+import static io.onedev.server.model.support.issue.IssueConstants.FIELD_SUBMITTER;+import static io.onedev.server.model.support.issue.IssueConstants.FIELD_SUBMIT_DATE;+import static io.onedev.server.model.support.issue.IssueConstants.FIELD_VOTE_COUNT;import java.io.Serializable;import java.util.ArrayList;@@ -24,7 +29,6 @@ import io.onedev.server.manager.IssueManager;import io.onedev.server.model.Issue;import io.onedev.server.model.User;import io.onedev.server.model.support.issue.IssueField;-import io.onedev.server.model.support.issue.workflow.IssueWorkflow;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.DateUtils;import io.onedev.server.web.component.avatar.AvatarLink;@@ -55,12 +59,11 @@ abstract class CardDetailPanel extends GenericPanel<Issue> {add(new Label("title", getIssue().getTitle()));- IssueWorkflow workflow = getIssue().getProject().getIssueWorkflow();List<String> fieldNames = Lists.newArrayList(FIELD_STATE);fieldNames.add(FIELD_SUBMITTER);fieldNames.add(FIELD_SUBMIT_DATE);- for (String fieldName: workflow.getFieldNames()) {- if (getIssue().isFieldVisible(fieldName, getIssue().getState()))+ for (String fieldName: getIssue().getFieldNames()) {+ if (getIssue().isFieldVisible(fieldName))fieldNames.add(fieldName);}fieldNames.add(FIELD_MILESTONE);diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/StateTransitionPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/StateTransitionPanel.javaindex 80bf37c41f..20b60088f2 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/StateTransitionPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/StateTransitionPanel.java@@ -1,7 +1,6 @@package io.onedev.server.web.page.project.issues.issueboards;import java.io.Serializable;-import java.util.Collection;import java.util.List;import java.util.Map;@@ -15,13 +14,13 @@ import org.apache.wicket.markup.html.panel.Panel;import io.onedev.server.OneDev;import io.onedev.server.manager.IssueActionManager;import io.onedev.server.model.Issue;-import io.onedev.server.model.support.issue.IssueConstants;+import io.onedev.server.model.support.issue.workflow.TransitionSpec;+import io.onedev.server.model.support.issue.workflow.transitiontrigger.PressButtonTrigger;import io.onedev.server.util.IssueUtils;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 jersey.repackaged.com.google.common.collect.Sets;@SuppressWarnings("serial")abstract class StateTransitionPanel extends Panel implements InputContext {@@ -36,21 +35,17 @@ abstract class StateTransitionPanel extends Panel implements InputContext {Class<?> fieldBeanClass = IssueUtils.defineBeanClass(getIssue().getProject());Serializable fieldBean = getIssue().getFieldBean(fieldBeanClass, true);- IssueUtils.setState(fieldBean, getTargetState());- Collection<String> excludedFields = Sets.newHashSet(IssueConstants.FIELD_STATE);- for (String fieldName: getIssue().getProject().getIssueWorkflow().getFieldNames()) {- if (getIssue().isFieldVisible(fieldName, getIssue().getState()))- excludedFields.add(fieldName);- }Form<?> form = new Form<Void>("form");form.setOutputMarkupId(true);add(form);- form.add(new Label("state", getTargetState()));+ form.add(new Label("state", getTransition().getToState()));++ PressButtonTrigger trigger = (PressButtonTrigger) getTransition().getTrigger();BeanEditor editor = BeanContext.editBean("editor", fieldBean,- IssueUtils.getPropertyNames(fieldBeanClass, excludedFields));+ IssueUtils.getPropertyNames(fieldBeanClass, trigger.getPromptFields()), false);form.add(editor);form.add(new AjaxButton("ok") {@@ -59,8 +54,9 @@ abstract class StateTransitionPanel extends Panel implements InputContext {protected void onSubmit(AjaxRequestTarget target, Form<?> form) {super.onSubmit(target, form);- Map<String, Object> fieldValues = IssueUtils.getFieldValues(fieldBean);- OneDev.getInstance(IssueActionManager.class).changeState(getIssue(), getTargetState(), fieldValues, null);+ getIssue().removeFields(getTransition().getRemoveFields());+ Map<String, Object> fieldValues = IssueUtils.getFieldValues(fieldBean, trigger.getPromptFields());+ OneDev.getInstance(IssueActionManager.class).changeState(getIssue(), getTransition().getToState(), fieldValues, null);onSaved(target);}@@ -113,5 +109,5 @@ abstract class StateTransitionPanel extends Panel implements InputContext {protected abstract void onCancelled(AjaxRequestTarget target);- protected abstract String getTargetState();+ protected abstract TransitionSpec getTransition();}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 4ef260058f..111b7ae3b9 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@@ -46,7 +46,6 @@ import org.apache.wicket.request.cycle.RequestCycle;import org.apache.wicket.request.mapper.parameter.PageParameters;import com.google.common.collect.Lists;-import com.google.common.collect.Sets;import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;import io.onedev.server.OneDev;@@ -65,10 +64,11 @@ import io.onedev.server.model.Milestone;import io.onedev.server.model.Project;import io.onedev.server.model.User;import io.onedev.server.model.support.EntityWatch;-import io.onedev.server.model.support.issue.IssueField;import io.onedev.server.model.support.issue.IssueConstants;+import io.onedev.server.model.support.issue.IssueField;import io.onedev.server.model.support.issue.workflow.IssueWorkflow;import io.onedev.server.model.support.issue.workflow.TransitionSpec;+import io.onedev.server.model.support.issue.workflow.transitiontrigger.PressButtonTrigger;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.IssueUtils;import io.onedev.server.util.inputspec.InputContext;@@ -247,89 +247,86 @@ public abstract class IssueDetailPage extends ProjectPage implements InputContex});for (TransitionSpec transition: transitions) {- if (transition.canApplyTo(getIssue())) {- AjaxLink<Void> link = new AjaxLink<Void>(transitionsView.newChildId()) {-- private String comment;-- @Override- public void onClick(AjaxRequestTarget target) {- Fragment fragment = new Fragment(ACTION_OPTIONS_ID, "transitionFrag", IssueDetailPage.this);- Class<?> fieldBeanClass = IssueUtils.defineBeanClass(getProject());- Serializable fieldBean = getIssue().getFieldBean(fieldBeanClass, true);- IssueUtils.setState(fieldBean, transition.getToState());-- Collection<String> excludedFields = Sets.newHashSet(IssueConstants.FIELD_STATE);- for (String fieldName: getProject().getIssueWorkflow().getFieldNames()) {- if (getIssue().isFieldVisible(fieldName, getIssue().getState()))- excludedFields.add(fieldName);- }+ if (transition.canTransite(getIssue()) && transition.getTrigger() instanceof PressButtonTrigger) {+ PressButtonTrigger trigger = (PressButtonTrigger) transition.getTrigger();+ if (trigger.isAuthorized()) {+ AjaxLink<Void> link = new AjaxLink<Void>(transitionsView.newChildId()) {- Form<?> form = new Form<Void>("form") {-- @Override- protected void onError() {- super.onError();- RequestCycle.get().find(AjaxRequestTarget.class).add(this);- }-- };-- BeanEditor editor = BeanContext.editBean("fields", fieldBean,- IssueUtils.getPropertyNames(fieldBeanClass, excludedFields));- form.add(editor);+ private String comment;- form.add(new CommentInput("comment", new PropertyModel<String>(this, "comment"), false) {-- @Override- protected AttachmentSupport getAttachmentSupport() {- return new ProjectAttachmentSupport(getProject(), getIssue().getUUID());- }-- @Override- protected Project getProject() {- return getIssue().getProject();- }+ @Override+ public void onClick(AjaxRequestTarget target) {+ Fragment fragment = new Fragment(ACTION_OPTIONS_ID, "transitionFrag", IssueDetailPage.this);+ Class<?> fieldBeanClass = IssueUtils.defineBeanClass(getProject());+ Serializable fieldBean = getIssue().getFieldBean(fieldBeanClass, true);++ Form<?> form = new Form<Void>("form") {++ @Override+ protected void onError() {+ super.onError();+ RequestCycle.get().find(AjaxRequestTarget.class).add(this);+ }++ };- @Override- protected List<AttributeModifier> getInputModifiers() {- return Lists.newArrayList(AttributeModifier.replace("placeholder", "Leave a comment"));- }+ Collection<String> propertyNames = IssueUtils.getPropertyNames(fieldBeanClass, trigger.getPromptFields());+ BeanEditor editor = BeanContext.editBean("fields", fieldBean, propertyNames, false);+ form.add(editor);- });-- form.add(new AjaxButton("save") {-- @Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);-- Map<String, Object> fieldValues = IssueUtils.getFieldValues(fieldBean);- getIssueChangeManager().changeState(getIssue(), transition.getToState(), fieldValues, comment);-- setResponsePage(IssueActivitiesPage.class, IssueActivitiesPage.paramsOf(getIssue(), position));- }+ form.add(new CommentInput("comment", new PropertyModel<String>(this, "comment"), false) {++ @Override+ protected AttachmentSupport getAttachmentSupport() {+ return new ProjectAttachmentSupport(getProject(), getIssue().getUUID());+ }++ @Override+ protected Project getProject() {+ return getIssue().getProject();+ }++ @Override+ protected List<AttributeModifier> getInputModifiers() {+ return Lists.newArrayList(AttributeModifier.replace("placeholder", "Leave a comment"));+ }++ });++ form.add(new AjaxButton("save") {++ @Override+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {+ super.onSubmit(target, form);++ getIssue().removeFields(transition.getRemoveFields());+ Map<String, Object> fieldValues = IssueUtils.getFieldValues(fieldBean, trigger.getPromptFields());+ getIssueChangeManager().changeState(getIssue(), transition.getToState(), fieldValues, comment);++ setResponsePage(IssueActivitiesPage.class, IssueActivitiesPage.paramsOf(getIssue(), position));+ }++ });- });-- form.add(new AjaxLink<Void>("cancel") {-- @Override- public void onClick(AjaxRequestTarget target) {- newEmptyActionOptions(target);- }+ form.add(new AjaxLink<Void>("cancel") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ newEmptyActionOptions(target);+ }++ });+ fragment.add(form);- });- fragment.add(form);+ fragment.setOutputMarkupId(true);+ IssueDetailPage.this.replace(fragment);+ target.add(fragment);+ }- fragment.setOutputMarkupId(true);- IssueDetailPage.this.replace(fragment);- target.add(fragment);- }-- };- link.add(new Label("label", transition.getTrigger().getButton().getName()));- transitionsView.add(link);+ };+ link.add(new Label("label", trigger.getButtonLabel()));+ transitionsView.add(link);+ }}}@@ -493,7 +490,7 @@ public abstract class IssueDetailPage extends ProjectPage implements InputContexprotected List<IssueField> load() {List<IssueField> fields = new ArrayList<>();for (IssueField field: getIssue().getFields().values()) {- if (getIssue().isFieldVisible(field.getName(), getIssue().getState()))+ if (getIssue().isFieldVisible(field.getName()))fields.add(field);}return fields;@@ -543,9 +540,9 @@ public abstract class IssueDetailPage extends ProjectPage implements InputContexClass<?> fieldBeanClass = IssueUtils.defineBeanClass(getProject());Serializable fieldBean = getIssue().getFieldBean(fieldBeanClass, true);-- Collection<String> excludedFields = Sets.newHashSet(IssueConstants.FIELD_STATE);- form.add(BeanContext.editBean("editor", fieldBean, IssueUtils.getPropertyNames(fieldBeanClass, excludedFields)));++ Collection<String> propertyNames = IssueUtils.getPropertyNames(fieldBeanClass, getIssue().getFieldNames());+ form.add(BeanContext.editBean("editor", fieldBean, propertyNames, false));form.add(new AjaxButton("save") {@@ -553,7 +550,7 @@ public abstract class IssueDetailPage extends ProjectPage implements InputContexprotected void onSubmit(AjaxRequestTarget target, Form<?> form) {super.onSubmit(target, form);- Map<String, Object> fieldValues = IssueUtils.getFieldValues(fieldBean);+ Map<String, Object> fieldValues = IssueUtils.getFieldValues(fieldBean, getIssue().getFieldNames());OneDev.getInstance(IssueActionManager.class).changeFields(getIssue(), fieldValues);modal.close();target.add(fieldsContainer);diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneActionsPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneActionsPanel.javaindex d87282b91a..8df91b0aec 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneActionsPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneActionsPanel.java@@ -73,7 +73,7 @@ abstract class MilestoneActionsPanel extends GenericPanel<Milestone> {MilestoneCloseOption option = new MilestoneCloseOption();option.setMilestoneToClose(getMilestone().getName());- form.add(BeanContext.editBean("editor", option, Sets.newHashSet("milestoneToClose")));+ form.add(BeanContext.editBean("editor", option, Sets.newHashSet("milestoneToClose"), true));form.add(new AjaxLink<Void>("close") {@@ -176,7 +176,7 @@ abstract class MilestoneActionsPanel extends GenericPanel<Milestone> {MilestoneDeleteOption option = new MilestoneDeleteOption();option.setMilestoneToDelete(getMilestone().getName());- form.add(BeanContext.editBean("editor", option, Sets.newHashSet("milestoneToDelete")));+ form.add(BeanContext.editBean("editor", option, Sets.newHashSet("milestoneToDelete"), true));form.add(new AjaxLink<Void>("close") {diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/fields/FieldBean.java b/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/fields/FieldBean.javaindex 512bf98814..8878da6c86 100644--- a/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/fields/FieldBean.java+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/fields/FieldBean.java@@ -14,7 +14,9 @@ public class FieldBean implements Serializable {private InputSpec field;- @Editable(name="Type")+ private boolean promptUponIssueOpen;++ @Editable(name="Type", order=100)@NotNull(message="may not be empty")public InputSpec getField() {return field;@@ -23,5 +25,15 @@ public class FieldBean implements Serializable {public void setField(InputSpec field) {this.field = field;}++ @Editable(order=200, description="Whether or not to prompt this field when the issue is opened. You may also "+ + "choose to prompt the field when issue transits to other states in state transition definitions")+ public boolean isPromptUponIssueOpen() {+ return promptUponIssueOpen;+ }++ public void setPromptUponIssueOpen(boolean promptUponIssueOpen) {+ this.promptUponIssueOpen = promptUponIssueOpen;+ }}diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/fields/FieldEditPanel.java b/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/fields/FieldEditPanel.javaindex d8492d11b1..4bff382ce5 100644--- a/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/fields/FieldEditPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/fields/FieldEditPanel.java@@ -46,10 +46,8 @@ abstract class FieldEditPanel extends Panel implements InputContext {super.onInitialize();FieldBean bean = new FieldBean();- if (fieldIndex != -1) {+ if (fieldIndex != -1)bean.setField(SerializationUtils.clone(getWorkflow().getFieldSpecs().get(fieldIndex)));- bean.getField().setupShowConditionsForDisplay();- }Form<?> form = new Form<Void>("form") {@@ -99,16 +97,18 @@ abstract class FieldEditPanel extends Panel implements InputContext {}if (!editor.hasErrors(true)) {- bean.getField().setupShowConditionsForStorage();if (fieldIndex != -1) {InputSpec oldField = getWorkflow().getFieldSpecs().get(fieldIndex);if (!field.getName().equals(oldField.getName()))getWorkflow().onRenameField(oldField.getName(), field.getName());getWorkflow().getFieldSpecs().set(fieldIndex, bean.getField());+ getWorkflow().getPromptFieldsUponIssueOpen().remove(oldField.getName());getWorkflow().setReconciled(false);} else {- getWorkflow().getFieldSpecs().add(bean.getField());+ getWorkflow().getFieldSpecs().add(field);}+ if (bean.isPromptUponIssueOpen())+ getWorkflow().getPromptFieldsUponIssueOpen().add(field.getName());getProject().setIssueWorkflow(getWorkflow());OneDev.getInstance(ProjectManager.class).save(getProject());onSave(target);@@ -147,7 +147,6 @@ abstract class FieldEditPanel extends Panel implements InputContext {@Overridepublic List<String> getInputNames() {List<String> inputNames = new ArrayList<>();- inputNames.add(IssueConstants.FIELD_STATE);int currentIndex = 0;for (InputSpec field: getWorkflow().getFieldSpecs()) {if (currentIndex != fieldIndex)diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/fields/IssueFieldsPage.java b/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/fields/IssueFieldsPage.javaindex 12899c1aff..5e2b32e1e0 100644--- a/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/fields/IssueFieldsPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/fields/IssueFieldsPage.java@@ -42,6 +42,7 @@ import io.onedev.server.web.editable.EditableUtils;import io.onedev.server.web.page.layout.SideFloating;import io.onedev.server.web.page.project.setting.issueworkflow.IssueWorkflowPage;import io.onedev.server.web.util.ajaxlistener.ConfirmListener;+import io.onedev.utils.StringUtils;import jersey.repackaged.com.google.common.collect.Sets;@SuppressWarnings("serial")@@ -103,6 +104,16 @@ public class IssueFieldsPage extends IssueWorkflowPage {}});+ columns.add(new AbstractColumn<InputSpec, Void>(Model.of("Prompt upon issue open")) {++ @Override+ public void populateItem(Item<ICellPopulator<InputSpec>> cellItem, String componentId, IModel<InputSpec> rowModel) {+ InputSpec field = rowModel.getObject();+ String label = StringUtils.describe(getWorkflow().getPromptFieldsUponIssueOpen().contains(field.getName()));+ cellItem.add(new ColumnFragment(componentId, rowModel, label, false));+ }+ });+IDataProvider<InputSpec> dataProvider = new ListDataProvider<InputSpec>() {@Override@@ -186,8 +197,7 @@ public class IssueFieldsPage extends IssueWorkflowPage {protected Component newBody(String id) {SideFloating sideFloating = this;Fragment fragment = new Fragment(id, "viewFieldFrag", IssueFieldsPage.this);- getField().setupShowConditionsForDisplay();- fragment.add(BeanContext.viewBean("viewer", getField(), Sets.newHashSet("name")));+ fragment.add(BeanContext.viewBean("viewer", getField(), Sets.newHashSet("name"), true));fragment.add(new ModalLink("edit") {@Overridediff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/fields/ShowConditionInnerWrapper.java b/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/fields/ShowConditionInnerWrapper.javadeleted file mode 100644index 7ba52cc7e3..0000000000--- a/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/fields/ShowConditionInnerWrapper.java+++ /dev/null@@ -1,27 +0,0 @@-package io.onedev.server.web.page.project.setting.issueworkflow.fields;--import java.io.Serializable;--import javax.validation.constraints.NotNull;--import io.onedev.server.util.inputspec.showcondition.ShowCondition;-import io.onedev.server.web.editable.annotation.Editable;--@Editable-public class ShowConditionInnerWrapper implements Serializable {-- private static final long serialVersionUID = 1L;-- private ShowCondition condition;-- @Editable(name="And")- @NotNull- public ShowCondition getCondition() {- return condition;- }-- public void setCondition(ShowCondition condition) {- this.condition = condition;- }--}diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/fields/ShowConditionListWrapper.java b/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/fields/ShowConditionListWrapper.javadeleted file mode 100644index 3d92d2e620..0000000000--- a/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/fields/ShowConditionListWrapper.java+++ /dev/null@@ -1,30 +0,0 @@-package io.onedev.server.web.page.project.setting.issueworkflow.fields;--import java.io.Serializable;-import java.util.ArrayList;-import java.util.List;--import javax.validation.constraints.Size;--import io.onedev.server.web.editable.annotation.Editable;-import io.onedev.server.web.editable.annotation.OmitName;--@Editable-public class ShowConditionListWrapper implements Serializable {-- private static final long serialVersionUID = 1L;-- private List<ShowConditionOuterWrapper> outerWrappers = new ArrayList<>();-- @Editable- @Size(min=1, message="At least one condition needs to be specified")- @OmitName- public List<ShowConditionOuterWrapper> getOuterWrappers() {- return outerWrappers;- }-- public void setOuterWrappers(List<ShowConditionOuterWrapper> outerWrappers) {- this.outerWrappers = outerWrappers;- }--}diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/fields/ShowConditionOuterWrapper.java b/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/fields/ShowConditionOuterWrapper.javadeleted file mode 100644index 5415e33730..0000000000--- a/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/fields/ShowConditionOuterWrapper.java+++ /dev/null@@ -1,26 +0,0 @@-package io.onedev.server.web.page.project.setting.issueworkflow.fields;--import java.io.Serializable;--import javax.validation.constraints.NotNull;--import io.onedev.server.web.editable.annotation.Editable;--@Editable(name="Condition")-public class ShowConditionOuterWrapper implements Serializable {-- private static final long serialVersionUID = 1L;-- private ShowConditionInnerWrapper innerWrapper = new ShowConditionInnerWrapper();-- @Editable- @NotNull- public ShowConditionInnerWrapper getInnerWrapper() {- return innerWrapper;- }-- public void setInnerWrapper(ShowConditionInnerWrapper innerWrapper) {- this.innerWrapper = innerWrapper;- }--}diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/fields/issue-fields.css b/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/fields/issue-fields.cssindex 5ae17d31f7..b7a6a6af7c 100644--- a/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/fields/issue-fields.css+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/fields/issue-fields.css@@ -45,38 +45,3 @@.property-nameOfEmptyValue .control-label {font-weight: normal;}--.property-outerWrappers table>thead,-.field-edit .property-outerWrappers>div>table>tbody>tr:first-child .name,-.field-view .property-outerWrappers>td>div>div>table>tbody>tr:first-child .name,-.field-edit .property-outerWrappers .required,-.field-edit .property-outerWrappers .handle {- display: none;-}--.field-view .property-outerWrappers table td {- border: none !important;- display: block;- padding-top: 0 !important;- padding-left: 0 !important;-}-.field-view .property-outerWrappers .property-inputName td {- padding-bottom: 8px !important;-}-.field-view .property-outerWrappers table td.name {- text-align: left !important;- padding: 8px 0 !important;-}-.field-view .property-condition td {- padding-bottom: 0 !important;-}-.property-innerWrapper .bean.editor {- border-top: none !important;- padding-top: 0 !important;- margin-bottom: 0 !important;-}-.property-innerWrapper .property-condition,-.property-innerWrapper .property-valueMatcher,-.property-innerWrapper .property-values {- margin-bottom: 0 !important;-}\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/states/IssueStatesPage.java b/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/states/IssueStatesPage.javaindex 90f7f7939c..03b7fa90f1 100644--- a/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/states/IssueStatesPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/states/IssueStatesPage.java@@ -221,7 +221,7 @@ public class IssueStatesPage extends IssueWorkflowPage {protected Component newBody(String id) {SideFloating sideFloating = this;Fragment fragment = new Fragment(id, "viewStateFrag", IssueStatesPage.this);- fragment.add(BeanContext.viewBean("viewer", getState(), Sets.newHashSet("name")));+ fragment.add(BeanContext.viewBean("viewer", getState(), Sets.newHashSet("name"), true));fragment.add(new ModalLink("edit") {@Overridediff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/statetransitions/StateTransitionsPage.java b/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/statetransitions/StateTransitionsPage.javaindex 51c76c4dd2..84bbe267af 100644--- a/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/statetransitions/StateTransitionsPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/statetransitions/StateTransitionsPage.java@@ -39,6 +39,7 @@ import io.onedev.server.web.behavior.sortable.SortPosition;import io.onedev.server.web.component.modal.ModalLink;import io.onedev.server.web.component.modal.ModalPanel;import io.onedev.server.web.editable.BeanContext;+import io.onedev.server.web.editable.EditableUtils;import io.onedev.server.web.page.layout.SideFloating;import io.onedev.server.web.page.project.setting.issueworkflow.IssueWorkflowPage;import io.onedev.server.web.util.ajaxlistener.ConfirmListener;@@ -105,6 +106,16 @@ public class StateTransitionsPage extends IssueWorkflowPage {});+ columns.add(new AbstractColumn<TransitionSpec, Void>(Model.of("Do Transition When")) {++ @Override+ public void populateItem(Item<ICellPopulator<TransitionSpec>> cellItem, String componentId, IModel<TransitionSpec> rowModel) {+ String label = EditableUtils.getDisplayName(rowModel.getObject().getTrigger().getClass());+ cellItem.add(new ColumnFragment(componentId, rowModel.getObject(), label));+ }++ });+IDataProvider<TransitionSpec> dataProvider = new ListDataProvider<TransitionSpec>() {@Override@@ -203,7 +214,7 @@ public class StateTransitionsPage extends IssueWorkflowPage {protected Component newBody(String id) {SideFloating sideFloating = this;Fragment fragment = new Fragment(id, "viewTransitionFrag", StateTransitionsPage.this);- fragment.add(BeanContext.viewBean("viewer", getTransition(), Sets.newHashSet("name")));+ fragment.add(BeanContext.viewBean("viewer", getTransition(), Sets.newHashSet("name"), true));fragment.add(new ModalLink("edit") {@Overridediff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/statetransitions/TransitionEditPanel.html b/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/statetransitions/TransitionEditPanel.htmlindex b17a9bc3d7..0d9cfb9d73 100644--- a/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/statetransitions/TransitionEditPanel.html+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/statetransitions/TransitionEditPanel.html@@ -3,7 +3,7 @@<div class="modal-header"><button wicket:id="close" type="button" class="close">×</button><h4 id="modal-title" class="modal-title">- Edit State+ Edit State Transition</h4></div><div class="modal-body">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.cssindex b3eac87531..e9391fbc56 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@@ -28,7 +28,9 @@.floating.state-transition .property-authorized .value {white-space: nowrap;}-.floating.state-transition .property-prerequisite .property-fieldName td.name {+.floating.state-transition .property-prerequisite .property-inputName td.name,+.floating.state-transition .property-buttonLabel td.name,+.floating.state-transition .property-promptFields td.name {border-right: none;text-align: left;}\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/user/PasswordEditPage.java b/core/src/main/java/io/onedev/server/web/page/user/PasswordEditPage.javaindex 88b4176e1a..afaefd6b11 100644--- a/core/src/main/java/io/onedev/server/web/page/user/PasswordEditPage.java+++ b/core/src/main/java/io/onedev/server/web/page/user/PasswordEditPage.java@@ -43,13 +43,13 @@ public class PasswordEditPage extends UserPage {Session.get().success("Password has been changed");bean.setOldPassword(null);- replace(BeanContext.editBean("editor", bean, excludedProperties));+ replace(BeanContext.editBean("editor", bean, excludedProperties, true));}};add(form);- form.add(BeanContext.editBean("editor", bean, excludedProperties));+ form.add(BeanContext.editBean("editor", bean, excludedProperties, true));}@Overridediff --git a/core/src/main/java/io/onedev/server/web/page/user/TokenGeneratePage.java b/core/src/main/java/io/onedev/server/web/page/user/TokenGeneratePage.javaindex 87c42090db..645fd52377 100644--- a/core/src/main/java/io/onedev/server/web/page/user/TokenGeneratePage.java+++ b/core/src/main/java/io/onedev/server/web/page/user/TokenGeneratePage.java@@ -10,7 +10,6 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.behavior.clipboard.CopyClipboardBehavior;import io.onedev.server.web.editable.BeanContext;-import jersey.repackaged.com.google.common.collect.Sets;@SuppressWarnings("serial")public class TokenGeneratePage extends UserPage {@@ -36,13 +35,13 @@ public class TokenGeneratePage extends UserPage {token = new String(Base64.encode((getUser().getName() + ":" + bean.getPassword()).getBytes()));bean.setPassword(null);- replace(BeanContext.editBean("editor", bean, Sets.newHashSet()));+ replace(BeanContext.editBean("editor", bean));}};add(form);- form.add(BeanContext.editBean("editor", bean, Sets.newHashSet()));+ form.add(BeanContext.editBean("editor", bean));add(new Label("token", new AbstractReadOnlyModel<String>() {diff --git a/core/src/main/java/io/onedev/server/web/page/user/UserProfilePage.java b/core/src/main/java/io/onedev/server/web/page/user/UserProfilePage.javaindex 74e7f16ab6..f248d2bfaf 100644--- a/core/src/main/java/io/onedev/server/web/page/user/UserProfilePage.java+++ b/core/src/main/java/io/onedev/server/web/page/user/UserProfilePage.java@@ -56,7 +56,7 @@ public class UserProfilePage extends UserPage {editor.getBeanDescriptor().copyProperties(object, getUser());}- }, Sets.newHashSet("password"));+ }, Sets.newHashSet("password"), true);Form<?> form = new Form<Void>("form") {@@ -108,7 +108,7 @@ public class UserProfilePage extends UserPage {} else {User user = new User();new BeanDescriptor(User.class).copyProperties(getUser(), user);- add(BeanContext.viewBean("content", user, Sets.newHashSet("password")));+ add(BeanContext.viewBean("content", user, Sets.newHashSet("password"), true));}}