The Unified and Autonomous Development Platform
Fix issue #434 - Able to transit issue state and change issue field directly from issue list and issue board card
Robin Shen44218059113f
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/ParamSpec.java b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/ParamSpec.javaindex 251180e90b..98f6d3d08a 100755--- a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/ParamSpec.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/ParamSpec.java@@ -92,5 +92,4 @@ public abstract class ParamSpec extends InputSpec {return null;}-}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.javaindex 0506256b1d..58af46afab 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java@@ -365,7 +365,7 @@ public class DefaultProjectManager extends BaseEntityManager<Project>child = find(project, name);if (child == null) {if (project == null && !SecurityUtils.canCreateRootProjects())- throw new UnauthorizedException("Not authorized to create project under root");+ throw new UnauthorizedException("Not authorized to create root project");if (project != null && !SecurityUtils.canCreateChildren(project))throw new UnauthorizedException("Not authorized to create project under '" + project.getPath() + "'");child = new Project();diff --git a/server-core/src/main/java/io/onedev/server/event/issue/IssueChangeEvent.java b/server-core/src/main/java/io/onedev/server/event/issue/IssueChangeEvent.javaindex 35e7612eb5..b74284826e 100644--- a/server-core/src/main/java/io/onedev/server/event/issue/IssueChangeEvent.java+++ b/server-core/src/main/java/io/onedev/server/event/issue/IssueChangeEvent.java@@ -30,7 +30,7 @@ public class IssueChangeEvent extends IssueEvent {}@Override- public boolean affectsBoards() {+ public boolean affectsListing() {return change.affectsBoards();}diff --git a/server-core/src/main/java/io/onedev/server/event/issue/IssueCommented.java b/server-core/src/main/java/io/onedev/server/event/issue/IssueCommented.javaindex 08e678524a..78a1f8879b 100644--- a/server-core/src/main/java/io/onedev/server/event/issue/IssueCommented.java+++ b/server-core/src/main/java/io/onedev/server/event/issue/IssueCommented.java@@ -26,7 +26,7 @@ public class IssueCommented extends IssueEvent {}@Override- public boolean affectsBoards() {+ public boolean affectsListing() {return false;}diff --git a/server-core/src/main/java/io/onedev/server/event/issue/IssueEvent.java b/server-core/src/main/java/io/onedev/server/event/issue/IssueEvent.javaindex 713e88151d..2b7d6e9442 100644--- a/server-core/src/main/java/io/onedev/server/event/issue/IssueEvent.java+++ b/server-core/src/main/java/io/onedev/server/event/issue/IssueEvent.java@@ -23,7 +23,7 @@ public abstract class IssueEvent extends ProjectEvent {return issue;}- public abstract boolean affectsBoards();+ public abstract boolean affectsListing();public Map<String, Collection<User>> getNewUsers() {return new HashMap<>();diff --git a/server-core/src/main/java/io/onedev/server/event/issue/IssueOpened.java b/server-core/src/main/java/io/onedev/server/event/issue/IssueOpened.javaindex 19d2d1d973..a2956fabeb 100644--- a/server-core/src/main/java/io/onedev/server/event/issue/IssueOpened.java+++ b/server-core/src/main/java/io/onedev/server/event/issue/IssueOpened.java@@ -27,7 +27,7 @@ public class IssueOpened extends IssueEvent {}@Override- public boolean affectsBoards() {+ public boolean affectsListing() {return true;}diff --git a/server-core/src/main/java/io/onedev/server/model/Issue.java b/server-core/src/main/java/io/onedev/server/model/Issue.javaindex 2f07ef4923..c049ee3ea5 100644--- a/server-core/src/main/java/io/onedev/server/model/Issue.java+++ b/server-core/src/main/java/io/onedev/server/model/Issue.java@@ -489,6 +489,10 @@ public class Issue extends AbstractEntity implements Referenceable, AttachmentStreturn Issue.class.getName() + ":" + issueId;}+ public static String getListWebSocketObservable(Long projectId) {+ return Issue.class.getName() + ":list:" + projectId;+ }+@Nullablepublic String getMilestoneName() {return getMilestone()!=null? getMilestone().getName():null;diff --git a/server-core/src/main/java/io/onedev/server/model/IssueChange.java b/server-core/src/main/java/io/onedev/server/model/IssueChange.javaindex c93d14b672..c099345b54 100644--- a/server-core/src/main/java/io/onedev/server/model/IssueChange.java+++ b/server-core/src/main/java/io/onedev/server/model/IssueChange.java@@ -73,7 +73,7 @@ public class IssueChange extends AbstractEntity {}public boolean affectsBoards() {- return data.affectsBoards();+ return data.affectsListing();}}diff --git a/server-core/src/main/java/io/onedev/server/model/Project.java b/server-core/src/main/java/io/onedev/server/model/Project.javaindex 7b1c52a152..eda521b311 100644--- a/server-core/src/main/java/io/onedev/server/model/Project.java+++ b/server-core/src/main/java/io/onedev/server/model/Project.java@@ -509,6 +509,13 @@ public class Project extends AbstractEntity {public Collection<Project> getChildren() {return children;}++ public Collection<Project> getDescendants() {+ Collection<Project> descendants = new ArrayList<>(getChildren());+ for (Project child: getChildren())+ descendants.addAll(child.getDescendants());+ return descendants;+ }public void setChildren(Collection<Project> children) {this.children = children;diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/BoardSpec.java b/server-core/src/main/java/io/onedev/server/model/support/issue/BoardSpec.javaindex 50a9798504..f203b5aa88 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/BoardSpec.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/BoardSpec.java@@ -400,10 +400,6 @@ public class BoardSpec implements Serializable {return query;}- public static String getWebSocketObservable(Long projectId) {- return BoardSpec.class.getName() + ":" + projectId;- }-public void onRenameUser(GlobalIssueSetting issueSetting, String oldName, String newName) {FieldSpec fieldSpec = issueSetting.getFieldSpec(getIdentifyField());if (fieldSpec instanceof UserChoiceField) {diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueChangeData.java b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueChangeData.javaindex 31755290d9..2bb9fe8380 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueChangeData.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueChangeData.java@@ -24,7 +24,7 @@ public abstract class IssueChangeData implements Serializable {public abstract Map<String, Group> getNewGroups();- public abstract boolean affectsBoards();+ public abstract boolean affectsListing();@Nullablepublic ActivityDetail getActivityDetail() {diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueFieldChangeData.java b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueFieldChangeData.javaindex 28dc745c59..ea437f2f8f 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueFieldChangeData.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueFieldChangeData.java@@ -142,7 +142,7 @@ public class IssueFieldChangeData extends IssueChangeData {}@Override- public boolean affectsBoards() {+ public boolean affectsListing() {return true;}diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueMilestoneChangeData.java b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueMilestoneChangeData.javaindex 3204bc2de4..62c1ec6c23 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueMilestoneChangeData.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueMilestoneChangeData.java@@ -54,7 +54,7 @@ public class IssueMilestoneChangeData extends IssueChangeData {}@Override- public boolean affectsBoards() {+ public boolean affectsListing() {return true;}diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueReferencedFromCodeCommentData.java b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueReferencedFromCodeCommentData.javaindex b1f5a0451f..ac7f97deda 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueReferencedFromCodeCommentData.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueReferencedFromCodeCommentData.java@@ -50,7 +50,7 @@ public class IssueReferencedFromCodeCommentData extends IssueChangeData implemen}@Override- public boolean affectsBoards() {+ public boolean affectsListing() {return false;}diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueReferencedFromIssueData.java b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueReferencedFromIssueData.javaindex 6f7034f5fd..7ea55cd314 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueReferencedFromIssueData.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueReferencedFromIssueData.java@@ -50,7 +50,7 @@ public class IssueReferencedFromIssueData extends IssueChangeData implements Ref}@Override- public boolean affectsBoards() {+ public boolean affectsListing() {return false;}diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueReferencedFromPullRequestData.java b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueReferencedFromPullRequestData.javaindex 3565a1e810..52616712ea 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueReferencedFromPullRequestData.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueReferencedFromPullRequestData.java@@ -50,7 +50,7 @@ public class IssueReferencedFromPullRequestData extends IssueChangeData implemen}@Override- public boolean affectsBoards() {+ public boolean affectsListing() {return false;}diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueTitleChangeData.java b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueTitleChangeData.javaindex 31e82006be..b7048c4258 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueTitleChangeData.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueTitleChangeData.java@@ -43,7 +43,7 @@ public class IssueTitleChangeData extends IssueChangeData {}@Override- public boolean affectsBoards() {+ public boolean affectsListing() {return false;}diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/FieldUtils.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/FieldUtils.javaindex b5e26d45ff..0408bc8aeb 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/field/FieldUtils.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/FieldUtils.java@@ -1,26 +1,124 @@package io.onedev.server.model.support.issue.field;+import java.io.Serializable;import java.util.Collection;import java.util.HashMap;import java.util.List;import java.util.Map;+import java.util.stream.Collectors;+import javax.annotation.Nullable;import javax.validation.ValidationException;+import org.apache.wicket.Component;+import org.apache.wicket.MarkupContainer;+import org.apache.wicket.MetaDataKey;+import org.apache.wicket.request.cycle.RequestCycle;import org.slf4j.Logger;import org.slf4j.LoggerFactory;import com.google.common.base.Preconditions;+import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.SettingManager;+import io.onedev.server.model.Project;+import io.onedev.server.model.support.administration.GlobalIssueSetting;+import io.onedev.server.model.support.inputspec.InputContext;+import io.onedev.server.model.support.inputspec.InputSpec;import io.onedev.server.model.support.inputspec.SecretInput;import io.onedev.server.model.support.issue.field.spec.FieldSpec;import io.onedev.server.model.support.issue.field.spec.SecretField;import io.onedev.server.model.support.issue.field.supply.FieldSupply;import io.onedev.server.model.support.issue.field.supply.SpecifiedValue;+import io.onedev.server.security.SecurityUtils;+import io.onedev.server.util.ComponentContext;+import io.onedev.server.util.EditContext;+import io.onedev.server.web.editable.BeanDescriptor;+import io.onedev.server.web.editable.PropertyDescriptor;public class FieldUtils {- private static final Logger logger = LoggerFactory.getLogger(FieldSupply.class);+ private static final Logger logger = LoggerFactory.getLogger(FieldUtils.class);++ private static final MetaDataKey<Class<? extends Serializable>> FIELD_BEAN_CLASS_KEY =+ new MetaDataKey<Class<? extends Serializable>>() {++ private static final long serialVersionUID = 1L;++ };++ public static final String FIELD_BEAN_CLASS_NAME = "IssueFieldBean";++ public static void clearFields(Serializable fieldBean) {+ for (List<PropertyDescriptor> groupProperties: new BeanDescriptor(fieldBean.getClass()).getProperties().values()) {+ for (PropertyDescriptor property: groupProperties)+ property.setPropertyValue(fieldBean, null);+ }+ }++ public static Class<? extends Serializable> getFieldBeanClass() {+ RequestCycle requestCycle = RequestCycle.get();+ if (requestCycle != null) {+ Class<? extends Serializable> fieldBeanClass = requestCycle.getMetaData(FIELD_BEAN_CLASS_KEY);+ if (fieldBeanClass == null) {+ fieldBeanClass = defineFieldBeanClass();+ requestCycle.setMetaData(FIELD_BEAN_CLASS_KEY, fieldBeanClass);+ }+ return fieldBeanClass;+ } else {+ return defineFieldBeanClass();+ }+ }++ @SuppressWarnings("unchecked")+ private static Class<? extends Serializable> defineFieldBeanClass() {+ GlobalIssueSetting issueSetting = OneDev.getInstance(SettingManager.class).getIssueSetting();+ return (Class<? extends Serializable>) FieldSpec.defineClass(FIELD_BEAN_CLASS_NAME,+ "Issue Fields", issueSetting.getFieldSpecs());+ }++ public static Collection<String> getEditablePropertyNames(Project project, Class<?> fieldBeanClass, Collection<String> fieldNames) {+ BeanDescriptor descriptor = new BeanDescriptor(fieldBeanClass);+ return fieldNames.stream()+ .map(it->getPropertyName(descriptor, it))+ .filter(it->it!=null && SecurityUtils.canEditIssueField(project, it))+ .collect(Collectors.toList());+ }++ public static Collection<String> getEditableFields(Project project, Collection<String> fieldNames) {+ return fieldNames.stream()+ .filter(it->SecurityUtils.canEditIssueField(project, it))+ .collect(Collectors.toList());+ }++ @Nullable+ public static String getPropertyName(BeanDescriptor descriptor, String fieldName) {+ for (List<PropertyDescriptor> groupProperties: descriptor.getProperties().values()) {+ for (PropertyDescriptor property: groupProperties) {+ if (fieldName.equals(property.getDisplayName()))+ return property.getPropertyName();+ }+ }+ return null;+ }++ public static Map<String, Object> getFieldValues(ComponentContext context, Serializable fieldBean, Collection<String> fieldNames) {+ ComponentContext.push(context);+ try {+ Map<String, Object> fieldValues = new HashMap<>();+ BeanDescriptor beanDescriptor = new BeanDescriptor(fieldBean.getClass());+ for (List<PropertyDescriptor> groupProperties: beanDescriptor.getProperties().values()) {+ for (PropertyDescriptor property: groupProperties) {+ if (fieldNames.contains(property.getDisplayName()))+ fieldValues.put(property.getDisplayName(), property.getPropertyValue(fieldBean));+ }+ }++ return fieldValues;+ } finally {+ ComponentContext.pop();+ }+ }private static void validateFieldValue(FieldSpec fieldSpec, String fieldName, List<String> fieldValue) {try {@@ -73,4 +171,67 @@ public class FieldUtils {validateFieldMap(fieldSpecs, fieldMap);}+ public static boolean isFieldVisible(BeanDescriptor beanDescriptor, Serializable fieldBean, String fieldName) {+ String propertyName = getPropertyName(beanDescriptor, fieldName);+ PropertyDescriptor propertyDescriptor = new PropertyDescriptor(fieldBean.getClass(), propertyName);+ return propertyDescriptor.isPropertyVisible(newPropertyComponentContexts(beanDescriptor, fieldBean), beanDescriptor);+ }++ public static Map<String, ComponentContext> newPropertyComponentContexts(BeanDescriptor beanDescriptor, Serializable fieldBean) {+ Map<String, ComponentContext> componentContexts = new HashMap<>();++ ComponentContext componentContext = new ComponentContext(newContextComponent(beanDescriptor, fieldBean));+ for (List<PropertyDescriptor> group: beanDescriptor.getProperties().values()) {+ for (PropertyDescriptor property: group)+ componentContexts.put(property.getPropertyName(), componentContext);+ }++ return componentContexts;+ }++ private static Component newContextComponent(BeanDescriptor beanDescriptor, Serializable fieldBean) {+ class FakeComponent extends MarkupContainer implements InputContext, EditContext {++ private static final long serialVersionUID = 1L;++ public FakeComponent() {+ super("component");+ }++ @Override+ public Object getInputValue(String name) {+ return beanDescriptor.getProperty(name).getPropertyValue(fieldBean);+ }++ @Override+ public List<String> getInputNames() {+ return getIssueSetting().getFieldNames();+ }++ private GlobalIssueSetting getIssueSetting() {+ return OneDev.getInstance(SettingManager.class).getIssueSetting();+ }++ @Override+ public InputSpec getInputSpec(String inputName) {+ return getIssueSetting().getFieldSpec(inputName);+ }++ }+ return new FakeComponent();+ }++ public static ComponentContext newBeanComponentContext(BeanDescriptor beanDescriptor, Serializable fieldBean) {+ return new ComponentContext(newContextComponent(beanDescriptor, fieldBean)) {++ private static final long serialVersionUID = 1L;++ @Override+ public ComponentContext getChildContext(String childName) {+ return new ComponentContext(newContextComponent(beanDescriptor, fieldBean));+ }++ };+ }+}diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/BooleanField.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/BooleanField.javaindex 3981d2ed13..4744a2c191 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/BooleanField.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/BooleanField.java@@ -61,4 +61,9 @@ public class BooleanField extends FieldSpec {return BooleanInput.convertToStrings(value);}+ @Override+ protected void runScripts() {+ getDefaultValueProvider().getDefaultValue();+ }+}diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/BuildChoiceField.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/BuildChoiceField.javaindex 3b7a2c0d77..714b2df371 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/BuildChoiceField.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/BuildChoiceField.java@@ -34,4 +34,9 @@ public class BuildChoiceField extends FieldSpec {return super.getOrdinal(fieldValue);}+ @Override+ protected void runScripts() {++ }+}diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/ChoiceField.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/ChoiceField.javaindex 81ec19123e..dbf7715339 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/ChoiceField.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/ChoiceField.java@@ -103,4 +103,13 @@ public class ChoiceField extends FieldSpec {}}+ @Override+ protected void runScripts() {+ if (isAllowMultiple() && getDefaultMultiValueProvider() != null)+ getDefaultMultiValueProvider().getDefaultValue();+ if (!isAllowMultiple() && getDefaultValueProvider() != null)+ getDefaultValueProvider().getDefaultValue();+ getChoiceProvider().getChoices(true);+ }+}diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/CommitField.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/CommitField.javaindex 58eacf6f2b..1a20cf594d 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/CommitField.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/CommitField.java@@ -31,5 +31,9 @@ public class CommitField extends FieldSpec {public List<String> convertToStrings(Object value) {return CommitInput.convertToStrings(value);}++ @Override+ protected void runScripts() {+ }}diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/DateField.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/DateField.javaindex 41613abe3c..5a97dafcb6 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/DateField.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/DateField.java@@ -58,4 +58,10 @@ public class DateField extends FieldSpec {return super.getOrdinal(fieldValue);}+ @Override+ protected void runScripts() {+ if (getDefaultValueProvider() != null)+ getDefaultValueProvider().getDefaultValue();+ }+}diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/DateTimeField.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/DateTimeField.javaindex c2aba1de37..9d733850b7 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/DateTimeField.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/DateTimeField.java@@ -58,4 +58,10 @@ public class DateTimeField extends FieldSpec {return super.getOrdinal(fieldValue);}+ @Override+ protected void runScripts() {+ if (getDefaultValueProvider() != null)+ getDefaultValueProvider().getDefaultValue();+ }+}diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/FieldSpec.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/FieldSpec.javaindex b65889fb64..32f4de9c64 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/FieldSpec.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/FieldSpec.java@@ -2,21 +2,29 @@ package io.onedev.server.model.support.issue.field.spec;import java.util.Collection;import java.util.HashSet;+import java.util.List;import java.util.Map;+import java.util.Set;import javax.validation.Valid;+import org.apache.wicket.MarkupContainer;import org.hibernate.validator.constraints.NotEmpty;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.support.administration.GlobalIssueSetting;+import io.onedev.server.model.support.inputspec.InputContext;import io.onedev.server.model.support.inputspec.InputSpec;import io.onedev.server.model.support.inputspec.choiceinput.choiceprovider.SpecifiedChoices;import io.onedev.server.model.support.inputspec.showcondition.ShowCondition;import io.onedev.server.model.support.inputspec.showcondition.ValueIsNotAnyOf;import io.onedev.server.model.support.inputspec.showcondition.ValueIsOneOf;+import io.onedev.server.util.ComponentContext;import io.onedev.server.util.EditContext;+import io.onedev.server.util.script.identity.ScriptIdentity;+import io.onedev.server.util.script.identity.ScriptIdentityAware;+import io.onedev.server.util.script.identity.SiteAdministrator;import io.onedev.server.util.usage.Usage;import io.onedev.server.util.validation.annotation.FieldName;import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldResolution;@@ -32,6 +40,10 @@ public abstract class FieldSpec extends InputSpec {private String nameOfEmptyValue;+ private transient Collection<String> dependencies;++ private transient Collection<String> dependents;+@Editable(order=10)@FieldName@NotEmpty@@ -223,4 +235,98 @@ public abstract class FieldSpec extends InputSpec {return new Usage();}+ public Collection<String> getDependencies() {+ if (dependencies == null) {+ dependencies = new HashSet<>();+ if (getShowCondition() != null)+ dependencies.add(getShowCondition().getInputName());++ class PropertyComponent extends MarkupContainer implements InputContext, EditContext, ScriptIdentityAware {++ private static final long serialVersionUID = 1L;++ public PropertyComponent() {+ super("component");+ }++ @Override+ public List<String> getInputNames() {+ return getIssueSetting().getFieldNames();+ }++ @Override+ public InputSpec getInputSpec(String inputName) {+ return getIssueSetting().getFieldSpec(inputName);+ }++ @Override+ public Object getInputValue(String name) {+ dependencies.add(name);+ return null;+ }++ @Override+ public ScriptIdentity getScriptIdentity() {+ return new SiteAdministrator();+ }++ }++ ComponentContext.push(new ComponentContext(new PropertyComponent()));+ try {+ runScripts();+ } catch (Exception e) {+ e.printStackTrace();+ } finally {+ ComponentContext.pop();+ }+ }+ return dependencies;+ }++ protected abstract void runScripts();++ public Collection<String> getTransitiveDependencies() {+ return getTransitiveDependencies(new HashSet<>());+ }++ private Collection<String> getTransitiveDependencies(Set<String> checkedFields) {+ Collection<String> transitiveDependencies = new HashSet<>(getDependencies());+ for (String dependency: getDependencies()) {+ if (checkedFields.add(dependency)) {+ FieldSpec dependencyField = getIssueSetting().getFieldSpec(dependency);+ if (dependencyField != null)+ transitiveDependencies.addAll(dependencyField.getTransitiveDependencies(checkedFields));+ }+ }+ return transitiveDependencies;+ }++ public Collection<String> getDependents() {+ if (dependents == null) {+ dependents = new HashSet<>();+ for (FieldSpec field: getIssueSetting().getFieldSpecs()) {+ if (field.getDependencies().contains(getName()))+ dependents.add(field.getName());+ }+ }+ return dependents;+ }++ public Collection<String> getTransitiveDependents() {+ return getTransitiveDependents(new HashSet<>());+ }++ private Collection<String> getTransitiveDependents(Set<String> checkedFields) {+ Collection<String> transitiveDependents = new HashSet<>(getDependents());+ for (String dependent: getDependents()) {+ if (checkedFields.add(dependent)) {+ FieldSpec dependentField = getIssueSetting().getFieldSpec(dependent);+ if (dependentField != null)+ transitiveDependents.addAll(dependentField.getTransitiveDependents(checkedFields));+ }+ }+ return transitiveDependents;+ }+}diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/FloatField.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/FloatField.javaindex 3f233d3fa9..d2c3f93425 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/FloatField.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/FloatField.java@@ -56,5 +56,11 @@ public class FloatField extends FieldSpec {elsereturn super.getOrdinal(fieldValue);}++ @Override+ protected void runScripts() {+ if (getDefaultValueProvider() != null)+ getDefaultValueProvider().getDefaultValue();+ }}diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/GroupChoiceField.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/GroupChoiceField.javaindex c165889263..569176c47d 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/GroupChoiceField.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/GroupChoiceField.java@@ -88,5 +88,12 @@ public class GroupChoiceField extends FieldSpec {}return new Usage();}++ @Override+ protected void runScripts() {+ if (getDefaultValueProvider() != null)+ getDefaultValueProvider().getDefaultValue();+ getChoiceProvider().getChoices(true);+ }}diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/IntegerField.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/IntegerField.javaindex 9526d0f60a..0771762ed8 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/IntegerField.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/IntegerField.java@@ -78,5 +78,11 @@ public class IntegerField extends FieldSpec {elsereturn super.getOrdinal(fieldValue);}++ @Override+ protected void runScripts() {+ if (getDefaultValueProvider() != null)+ getDefaultValueProvider().getDefaultValue();+ }}diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/IssueChoiceField.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/IssueChoiceField.javaindex 407dcf465d..4c109e3ef1 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/IssueChoiceField.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/IssueChoiceField.java@@ -40,4 +40,8 @@ public class IssueChoiceField extends FieldSpec {return super.getOrdinal(fieldValue);}+ @Override+ protected void runScripts() {+ }+}diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/PullRequestChoiceField.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/PullRequestChoiceField.javaindex 5bce6cf6a9..795bdd8d63 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/PullRequestChoiceField.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/PullRequestChoiceField.java@@ -40,4 +40,8 @@ public class PullRequestChoiceField extends FieldSpec {return super.getOrdinal(fieldValue);}+ @Override+ protected void runScripts() {+ }+}diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/SecretField.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/SecretField.javaindex 36f1aa217c..28e7330212 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/SecretField.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/SecretField.java@@ -38,4 +38,8 @@ public class SecretField extends FieldSpec {return SecretInput.convertToStrings(value);}+ @Override+ protected void runScripts() {+ }+}diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/TextField.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/TextField.javaindex c381ac49cc..d080ee444e 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/TextField.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/TextField.java@@ -71,5 +71,11 @@ public class TextField extends FieldSpec {public List<String> convertToStrings(Object value) {return TextInput.convertToStrings(value);}++ @Override+ protected void runScripts() {+ if (getDefaultValueProvider() != null)+ getDefaultValueProvider().getDefaultValue();+ }}diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/UserChoiceField.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/UserChoiceField.javaindex 9b2825fddf..2b6b5e42c7 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/UserChoiceField.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/UserChoiceField.java@@ -114,4 +114,13 @@ public class UserChoiceField extends FieldSpec {return UserChoiceInput.convertToStrings(this, value);}+ @Override+ protected void runScripts() {+ if (isAllowMultiple() && getDefaultMultiValueProvider() != null)+ getDefaultMultiValueProvider().getDefaultValue();+ if (!isAllowMultiple() && getDefaultValueProvider() != null)+ getDefaultValueProvider().getDefaultValue();+ getChoiceProvider().getChoices(true);+ }+}diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/WorkingPeriodField.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/WorkingPeriodField.javaindex 92e67fdea4..5c5b1da365 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/WorkingPeriodField.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/WorkingPeriodField.java@@ -58,4 +58,10 @@ public class WorkingPeriodField extends FieldSpec {return super.getOrdinal(fieldValue);}+ @Override+ protected void runScripts() {+ if (getDefaultValueProvider() != null)+ getDefaultValueProvider().getDefaultValue();+ }+}diff --git a/server-core/src/main/java/io/onedev/server/util/ComponentContext.java b/server-core/src/main/java/io/onedev/server/util/ComponentContext.javaindex 9bb0260c70..584c02a239 100644--- a/server-core/src/main/java/io/onedev/server/util/ComponentContext.java+++ b/server-core/src/main/java/io/onedev/server/util/ComponentContext.java@@ -51,7 +51,6 @@ public class ComponentContext implements Serializable {return component;}- @Nullablepublic ComponentContext getChildContext(String childName) {return null;}diff --git a/server-core/src/main/java/io/onedev/server/util/IssueUtils.java b/server-core/src/main/java/io/onedev/server/util/IssueUtils.javaindex 9f58a998e7..5f3f827052 100644--- a/server-core/src/main/java/io/onedev/server/util/IssueUtils.java+++ b/server-core/src/main/java/io/onedev/server/util/IssueUtils.java@@ -1,33 +1,21 @@package io.onedev.server.util;-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.regex.Matcher;import java.util.regex.Pattern;-import javax.annotation.Nullable;-import org.unbescape.java.JavaEscape;import com.google.common.collect.Lists;import io.onedev.commons.utils.StringUtils;-import io.onedev.server.OneDev;-import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.Project;-import io.onedev.server.model.support.administration.GlobalIssueSetting;-import io.onedev.server.model.support.issue.field.spec.FieldSpec;-import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.validation.ProjectPathValidator;-import io.onedev.server.web.editable.BeanDescriptor;-import io.onedev.server.web.editable.PropertyDescriptor;public class IssueUtils {-+private static final List<String> ISSUE_FIX_WORDS = Lists.newArrayList("fix", "fixed", "fixes", "fixing","resolve", "resolved", "resolves", "resolving",@@ -44,63 +32,6 @@ public class IssueUtils {ISSUE_FIX_PATTERN = Pattern.compile(builder.toString());}- private static final String FIELD_BEAN_CLASS = "IssueFieldBean";-- public static void clearFields(Serializable fieldBean) {- for (List<PropertyDescriptor> groupProperties: new BeanDescriptor(fieldBean.getClass()).getProperties().values()) {- for (PropertyDescriptor property: groupProperties)- property.setPropertyValue(fieldBean, null);- }- }-- @SuppressWarnings("unchecked")- public static Class<? extends Serializable> defineFieldBeanClass() {- GlobalIssueSetting issueSetting = OneDev.getInstance(SettingManager.class).getIssueSetting();- return (Class<? extends Serializable>) FieldSpec.defineClass(FIELD_BEAN_CLASS,- "Issue Fields", issueSetting.getFieldSpecs());- }-- @Nullable- public static Class<? extends Serializable> loadFieldBeanClass(String className) {- if (className.equals(FIELD_BEAN_CLASS))- return defineFieldBeanClass();- else- return null;- }-- public static Collection<String> getPropertyNames(Project project, Class<?> fieldBeanClass, Collection<String> fieldNames) {- Collection<String> propertyNames = new HashSet<>();- SettingManager settingManager = OneDev.getInstance(SettingManager.class);- for (List<PropertyDescriptor> groupProperties: new BeanDescriptor(fieldBeanClass).getProperties().values()) {- for (PropertyDescriptor property: groupProperties) {- if (fieldNames.contains(property.getDisplayName())) {- FieldSpec field = settingManager.getIssueSetting().getFieldSpec(property.getDisplayName());- if (field != null && SecurityUtils.canEditIssueField(project, field.getName()))- propertyNames.add(property.getPropertyName());- }- }- }- return propertyNames;- }-- public static Map<String, Object> getFieldValues(ComponentContext context, Serializable fieldBean, Collection<String> fieldNames) {- ComponentContext.push(context);- try {- Map<String, Object> fieldValues = new HashMap<>();- BeanDescriptor beanDescriptor = new BeanDescriptor(fieldBean.getClass());- for (List<PropertyDescriptor> groupProperties: beanDescriptor.getProperties().values()) {- for (PropertyDescriptor property: groupProperties) {- if (fieldNames.contains(property.getDisplayName()))- fieldValues.put(property.getDisplayName(), property.getPropertyValue(fieldBean));- }- }-- return fieldValues;- } finally {- ComponentContext.pop();- }- }-public static Collection<Long> parseFixedIssueNumbers(Project project, String commitMessage) {Collection<Long> issueNumbers = new HashSet<>();diff --git a/server-core/src/main/java/io/onedev/server/web/ajaxlistener/AppendAjaxIndicatorListener.java b/server-core/src/main/java/io/onedev/server/web/ajaxlistener/AttachAjaxIndicatorListener.javasimilarity index 51%rename from server-core/src/main/java/io/onedev/server/web/ajaxlistener/AppendAjaxIndicatorListener.javarename to server-core/src/main/java/io/onedev/server/web/ajaxlistener/AttachAjaxIndicatorListener.javaindex 479e557761..1d36a16d68 100644--- a/server-core/src/main/java/io/onedev/server/web/ajaxlistener/AppendAjaxIndicatorListener.java+++ b/server-core/src/main/java/io/onedev/server/web/ajaxlistener/AttachAjaxIndicatorListener.java@@ -10,14 +10,26 @@ import io.onedev.server.web.asset.icon.IconScope;import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;import io.onedev.server.web.component.svg.SpriteImage;-public class AppendAjaxIndicatorListener implements IAjaxCallListener {+public class AttachAjaxIndicatorListener implements IAjaxCallListener {+ public enum AttachMode {PREPEND, APPEND};++ private final Component attachTo;++ private final AttachMode attachMode;+private final boolean indicateSuccessful;- public AppendAjaxIndicatorListener(boolean indicateSuccessful) {+ public AttachAjaxIndicatorListener(Component attachTo, AttachMode attachMode, boolean indicateSuccessful) {+ this.attachTo = attachTo;+ this.attachMode = attachMode;this.indicateSuccessful = indicateSuccessful;}+ public AttachAjaxIndicatorListener(boolean indicateSuccessful) {+ this(null, AttachMode.APPEND, indicateSuccessful);+ }+@Overridepublic CharSequence getBeforeHandler(Component component) {return null;@@ -27,16 +39,20 @@ public class AppendAjaxIndicatorListener implements IAjaxCallListener {public CharSequence getPrecondition(Component component) {return null;}-+@Overridepublic CharSequence getBeforeSendHandler(Component component) {+ Component attachTo = this.attachTo;+ if (attachTo == null)+ attachTo = component;IRequestHandler handler = new ResourceReferenceRequestHandler(AbstractPostAjaxBehavior.INDICATOR);CharSequence url = RequestCycle.get().urlFor(handler);+ String insertAt = attachMode==AttachMode.APPEND?"after":"before";return String.format(""- + "$('#%s-working-indicator').remove(); "- + "$('#%s').after('<img id=\"%s-working-indicator\" src=\"%s\" class=\"working-indicator\"></img>');",- component.getMarkupId(), component.getMarkupId(), component.getMarkupId(), url);+ + "$('#%s').siblings('.working-indicator').remove(); "+ + "$('#%s').addClass('with-working-indicator').%s('<img src=\"%s\" width=\"16\" height=\"16\" class=\"working-indicator\"></img>');",+ attachTo.getMarkupId(), attachTo.getMarkupId(), insertAt, url);}@Override@@ -46,13 +62,19 @@ public class AppendAjaxIndicatorListener implements IAjaxCallListener {@Overridepublic CharSequence getSuccessHandler(Component component) {+ Component attachTo = this.attachTo;+ if (attachTo == null)+ attachTo = component;if (indicateSuccessful) {+ String insertAt = attachMode==AttachMode.APPEND?"after":"before";return String.format(""- + "$('#%s-working-indicator').remove();"- + "$('#%s').after('<svg id=\"%s-working-indicator\" class=\"icon working-indicator\"><use xlink:href=\"%s\"/></svg>');",- component.getMarkupId(), component.getMarkupId(), component.getMarkupId(), SpriteImage.getVersionedHref(IconScope.class, "tick"));+ + "$('#%s').removeClass('with-working-indicator').siblings('.working-indicator').remove();"+ + "$('#%s').%s('<svg class=\"icon working-indicator text-success\"><use xlink:href=\"%s\"/></svg>');",+ attachTo.getMarkupId(), attachTo.getMarkupId(), insertAt,+ SpriteImage.getVersionedHref(IconScope.class, "tick"));} else {- return String.format("$('#%s-working-indicator').remove();", component.getMarkupId());+ return String.format("$('#%s').removeClass('with-working-indicator').siblings('.working-indicator').remove();",+ attachTo.getMarkupId());}}diff --git a/server-core/src/main/java/io/onedev/server/web/component/beaneditmodal/BeanEditContentPanel.html b/server-core/src/main/java/io/onedev/server/web/component/beaneditmodal/BeanEditContentPanel.htmlindex b28b2e71c6..6bd35f09df 100644--- a/server-core/src/main/java/io/onedev/server/web/component/beaneditmodal/BeanEditContentPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/beaneditmodal/BeanEditContentPanel.html@@ -5,6 +5,7 @@<button wicket:id="close" type="button" class="close"><wicket:svg href="times" class="icon"/></button></div><div class="modal-body">+ <div wicket:id="feedback"></div><div wicket:id="editor"></div></div><div class="modal-footer">diff --git a/server-core/src/main/java/io/onedev/server/web/component/beaneditmodal/BeanEditContentPanel.java b/server-core/src/main/java/io/onedev/server/web/component/beaneditmodal/BeanEditContentPanel.javaindex d691237b6c..334a905f70 100644--- a/server-core/src/main/java/io/onedev/server/web/component/beaneditmodal/BeanEditContentPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/beaneditmodal/BeanEditContentPanel.java@@ -8,12 +8,14 @@ import javax.annotation.Nullable;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.markup.html.AjaxLink;import org.apache.wicket.ajax.markup.html.form.AjaxButton;+import org.apache.wicket.feedback.FencedFeedbackPanel;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.form.Form;import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.request.cycle.RequestCycle;import io.onedev.server.web.editable.BeanContext;+import io.onedev.server.web.editable.BeanEditor;import io.onedev.server.web.editable.EditableUtils;@SuppressWarnings("serial")@@ -43,7 +45,10 @@ abstract class BeanEditContentPanel extends Panel {elseform.add(new Label("title", EditableUtils.getDisplayName(getBean().getClass())));- form.add(BeanContext.edit("editor", getBean(), getPropertyNames(), isExclude()));+ form.add(new FencedFeedbackPanel("feedback", form));++ BeanEditor editor = BeanContext.edit("editor", getBean(), getPropertyNames(), isExclude());+ form.add(editor);form.add(new AjaxButton("ok") {diff --git a/server-core/src/main/java/io/onedev/server/web/component/beaneditmodal/BeanEditModalPanel.java b/server-core/src/main/java/io/onedev/server/web/component/beaneditmodal/BeanEditModalPanel.javaindex 70ec93f8e1..d5f7fe67cb 100644--- a/server-core/src/main/java/io/onedev/server/web/component/beaneditmodal/BeanEditModalPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/beaneditmodal/BeanEditModalPanel.java@@ -8,6 +8,7 @@ import javax.annotation.Nullable;import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;import io.onedev.server.web.component.modal.ModalPanel;@@ -22,13 +23,13 @@ public abstract class BeanEditModalPanel extends ModalPanel {private final String title;- public BeanEditModalPanel(AjaxRequestTarget target, Serializable bean) {- this(target, bean, new HashSet<>(), true, null);+ public BeanEditModalPanel(IPartialPageRequestHandler handler, Serializable bean) {+ this(handler, bean, new HashSet<>(), true, null);}- public BeanEditModalPanel(AjaxRequestTarget target, Serializable bean,+ public BeanEditModalPanel(IPartialPageRequestHandler handler, Serializable bean,Collection<String> propertyNames, boolean exclude, @Nullable String title) {- super(target);+ super(handler);this.bean = bean;this.propertyNames = propertyNames;this.exclude = exclude;diff --git a/server-core/src/main/java/io/onedev/server/web/component/floating/floating.js b/server-core/src/main/java/io/onedev/server/web/component/floating/floating.jsindex 2c4b1dfebc..196adf7550 100644--- a/server-core/src/main/java/io/onedev/server/web/component/floating/floating.js+++ b/server-core/src/main/java/io/onedev/server/web/component/floating/floating.js@@ -53,7 +53,10 @@ onedev.server.floating = {} else {if (alignment) {$floating.align(alignment);- $floating.trigger("resized");+ setTimeout(function() {+ $floating.align(alignment);+ $floating.trigger("resized");+ }, 0);}if (!openTriggered) {$floating.trigger("open");diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.java b/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.javaindex cdb57d6ff2..5724fbc1ac 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.java@@ -37,11 +37,11 @@ import io.onedev.server.model.support.administration.GlobalIssueSetting;import io.onedev.server.model.support.inputspec.InputContext;import io.onedev.server.model.support.inputspec.InputSpec;import io.onedev.server.model.support.issue.IssueTemplate;+import io.onedev.server.model.support.issue.field.FieldUtils;import io.onedev.server.search.entity.issue.IssueCriteria;import io.onedev.server.search.entity.issue.IssueQuery;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.ComponentContext;-import io.onedev.server.util.IssueUtils;import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;import io.onedev.server.web.behavior.ReferenceInputBehavior;import io.onedev.server.web.component.markdown.AttachmentSupport;@@ -79,11 +79,12 @@ public abstract class NewIssueEditor extends FormComponentPanel<Issue> implementsuper.onInitialize();Issue issue = newIssue();- Class<?> fieldBeanClass = IssueUtils.defineFieldBeanClass();+ Class<?> fieldBeanClass = FieldUtils.getFieldBeanClass();Serializable fieldBean = issue.getFieldBean(fieldBeanClass, true);Collection<String> fieldNames = getIssueSetting().getPromptFieldsUponIssueOpen();- issue.setFieldValues(IssueUtils.getFieldValues(new ComponentContext(this), fieldBean, fieldNames));+ issue.setFieldValues(FieldUtils.getFieldValues(new ComponentContext(this), fieldBean,+ FieldUtils.getEditableFields(getProject(), fieldNames)));titleInput = new TextField<String>("title", Model.of(""));titleInput.setRequired(true).setLabel(Model.of("Title"));@@ -124,8 +125,8 @@ public abstract class NewIssueEditor extends FormComponentPanel<Issue> implementadd(milestoneChoice);- Collection<String> properties = IssueUtils.getPropertyNames(getProject(),- fieldBeanClass, getIssueSetting().getPromptFieldsUponIssueOpen());+ Collection<String> properties = FieldUtils.getEditablePropertyNames(getProject(),+ fieldBeanClass, fieldNames);add(fieldEditor = new BeanContext(fieldBean.getClass(), properties, false).renderForEdit("fields", Model.of(fieldBean)));@@ -283,8 +284,9 @@ public abstract class NewIssueEditor extends FormComponentPanel<Issue> implementissue.setMilestone(milestoneChoice.getConvertedInput());fieldEditor.convertInput();- Collection<String> fieldNames = getIssueSetting().getPromptFieldsUponIssueOpen();- issue.setFieldValues(IssueUtils.getFieldValues(fieldEditor.newComponentContext(),+ Collection<String> fieldNames = FieldUtils.getEditableFields(getProject(),+ getIssueSetting().getPromptFieldsUponIssueOpen());+ issue.setFieldValues(FieldUtils.getFieldValues(fieldEditor.newComponentContext(),fieldEditor.getConvertedInput(), fieldNames));return issue;}diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesCssResourceReference.javanew file mode 100644index 0000000000..c773e3ac3b--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesCssResourceReference.java@@ -0,0 +1,13 @@+package io.onedev.server.web.component.issue.fieldvalues;++import io.onedev.server.web.page.base.BaseDependentCssResourceReference;++public class FieldValuesCssResourceReference extends BaseDependentCssResourceReference {++ private static final long serialVersionUID = 1L;++ public FieldValuesCssResourceReference() {+ super(FieldValuesCssResourceReference.class, "field-values.css");+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.html b/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.htmlindex 48dcc5fe5f..d99deaeabb 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.html@@ -1,19 +1,20 @@<wicket:panel>- <div wicket:id="content" class="field-values d-flex flex-wrap"></div>+ <div wicket:id="edit" class="field-values d-flex flex-nowrap">+ <div wicket:id="content" class="d-flex flex-wrap flex-grow-1"></div>+ <wicket:svg href="gear" class="icon icon-sm flex-shrink-0 ml-2"></wicket:svg>+ </div><wicket:fragment wicket:id="nonEmptyValuesFrag"><div wicket:id="values" class="value mb-2 mr-2"><span wicket:id="value"></span></div></wicket:fragment><wicket:fragment wicket:id="linkFrag">- <a wicket:id="link"><span wicket:id="label"></span></a>+ <a wicket:id="link" onclick="event.stopPropagation();"><span wicket:id="label"></span></a></wicket:fragment><wicket:fragment wicket:id="commitFrag">- <span class="btn-group">- <a wicket:id="hashLink" class="hash btn btn-sm btn-outline-secondary"><span wicket:id="hash"></span></a>- <a wicket:id="copyHash" class="btn btn-sm btn-outline-secondary"><wicket:svg href="copy" class="icon"></wicket:svg></a>- </span>+ <a wicket:id="hashLink" onclick="event.stopPropagation();" class="hash"><span wicket:id="hash"></span></a>+ <a wicket:id="copyHash" onclick="event.stopPropagation();" class="ml-1"><wicket:svg href="copy" class="icon icon-sm"></wicket:svg></a></wicket:fragment><wicket:fragment wicket:id="notAccessibleCommitFrag"><span wicket:id="hash"></span>- <a wicket:id="copyHash"><wicket:svg href="copy" class="icon"></wicket:svg></a>+ <a wicket:id="copyHash" onclick="event.stopPropagation();" class="ml-1"><wicket:svg href="copy" class="icon icon-sm"></wicket:svg></a></wicket:fragment></wicket:panel>diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.javaindex 52c041c655..fe5f93a112 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java@@ -1,8 +1,19 @@package io.onedev.server.web.component.issue.fieldvalues;+import java.io.Serializable;+import java.util.Collection;+import java.util.HashMap;+import java.util.List;+import java.util.Map;+import javax.annotation.Nullable;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;import org.apache.wicket.behavior.AttributeAppender;+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;+import org.apache.wicket.markup.head.CssHeaderItem;+import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.link.BookmarkablePageLink;@@ -19,6 +30,7 @@ import org.unbescape.html.HtmlEscape;import io.onedev.server.OneDev;import io.onedev.server.buildspec.param.spec.ParamSpec;import io.onedev.server.entitymanager.BuildManager;+import io.onedev.server.entitymanager.IssueChangeManager;import io.onedev.server.entitymanager.IssueManager;import io.onedev.server.entitymanager.PullRequestManager;import io.onedev.server.entitymanager.SettingManager;@@ -30,8 +42,11 @@ import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;import io.onedev.server.model.support.administration.GlobalIssueSetting;+import io.onedev.server.model.support.inputspec.InputContext;+import io.onedev.server.model.support.inputspec.InputSpec;import io.onedev.server.model.support.inputspec.SecretInput;import io.onedev.server.model.support.inputspec.choiceinput.choiceprovider.ChoiceProvider;+import io.onedev.server.model.support.issue.field.FieldUtils;import io.onedev.server.model.support.issue.field.spec.ChoiceField;import io.onedev.server.model.support.issue.field.spec.FieldSpec;import io.onedev.server.security.SecurityUtils;@@ -39,15 +54,21 @@ import io.onedev.server.util.ColorUtils;import io.onedev.server.util.ComponentContext;import io.onedev.server.util.EditContext;import io.onedev.server.util.Input;-import io.onedev.server.web.component.link.ViewStateAwarePageLink;+import io.onedev.server.web.ajaxlistener.AttachAjaxIndicatorListener;+import io.onedev.server.web.ajaxlistener.DisableGlobalAjaxIndicatorListener;+import io.onedev.server.web.component.beaneditmodal.BeanEditModalPanel;import io.onedev.server.web.component.link.copytoclipboard.CopyToClipboardLink;import io.onedev.server.web.component.user.ident.Mode;import io.onedev.server.web.component.user.ident.UserIdentPanel;+import io.onedev.server.web.editable.BeanDescriptor;import io.onedev.server.web.editable.EditableUtils;+import io.onedev.server.web.editable.InplacePropertyEditLink;+import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.page.project.builds.detail.dashboard.BuildDashboardPage;import io.onedev.server.web.page.project.commits.CommitDetailPage;import io.onedev.server.web.page.project.issues.detail.IssueActivitiesPage;import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequestActivitiesPage;+import io.onedev.server.web.util.ProjectAware;@SuppressWarnings("serial")public abstract class FieldValuesPanel extends Panel implements EditContext {@@ -63,12 +84,122 @@ public abstract class FieldValuesPanel extends Panel implements EditContext {return OneDev.getInstance(SettingManager.class).getIssueSetting();}+ private InplacePropertyEditLink newInplaceEditLink(String componentId) {+ return new InplacePropertyEditLink(componentId) {++ @Override+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {+ super.updateAjaxAttributes(attributes);+ attributes.getAjaxCallListeners().add(new DisableGlobalAjaxIndicatorListener());+ AttachAjaxIndicatorListener ajaxIndicatorListener = getInplaceEditAjaxIndicator();+ if (ajaxIndicatorListener != null)+ attributes.getAjaxCallListeners().add(ajaxIndicatorListener);+ }++ @Override+ protected void onUpdated(IPartialPageRequestHandler handler, Serializable bean, String propertyName) {+ BeanDescriptor beanDescriptor = new BeanDescriptor(bean.getClass());+ FieldSpec fieldSpec = getIssueSetting().getFieldSpec(getField().getName());+ Collection<String> dependentFields = fieldSpec.getTransitiveDependents();+ boolean hasVisibleEditableDependents = dependentFields.stream()+ .anyMatch(it->SecurityUtils.canEditIssueField(getIssue().getProject(), it)+ && FieldUtils.isFieldVisible(beanDescriptor, bean, it));++ Map<String, Object> fieldValues = new HashMap<>();+ Object propertyValue = new PropertyDescriptor(bean.getClass(), propertyName).getPropertyValue(bean);+ fieldValues.put(getField().getName(), propertyValue);++ if (hasVisibleEditableDependents) {+ Collection<String> propertyNames = FieldUtils.getEditablePropertyNames(+ getIssue().getProject(), bean.getClass(), dependentFields);+ class DependentFieldsEditor extends BeanEditModalPanel implements ProjectAware, InputContext {++ public DependentFieldsEditor(IPartialPageRequestHandler handler, Serializable bean,+ Collection<String> propertyNames, boolean exclude, String title) {+ super(handler, bean, propertyNames, exclude, title);+ }++ @Override+ public Project getProject() {+ return getIssue().getProject();+ }++ @Override+ public List<String> getInputNames() {+ throw new UnsupportedOperationException();+ }++ @Override+ public InputSpec getInputSpec(String inputName) {+ return getIssueSetting().getFieldSpec(inputName);+ }++ @Override+ protected void onSave(AjaxRequestTarget target, Serializable bean) {+ fieldValues.putAll(FieldUtils.getFieldValues(+ FieldUtils.newBeanComponentContext(beanDescriptor, bean),+ bean, FieldUtils.getEditableFields(getProject(), dependentFields)));+ OneDev.getInstance(IssueChangeManager.class).changeFields(getIssue(), fieldValues);+ close();+ }++ }++ new DependentFieldsEditor(handler, bean, propertyNames, false, "Dependent Fields");+ } else {+ OneDev.getInstance(IssueChangeManager.class).changeFields(getIssue(), fieldValues);+ }+ }++ @Override+ protected String getPropertyName() {+ BeanDescriptor descriptor = new BeanDescriptor(FieldUtils.getFieldBeanClass());+ return FieldUtils.getPropertyName(descriptor, getField().getName());+ }++ @Override+ protected Serializable getBean() {+ Class<?> fieldBeanClass = FieldUtils.getFieldBeanClass();+ return getIssue().getFieldBean(fieldBeanClass, true);+ }++ };+ }++ private boolean canEditField() {+ if (getField() != null && getIssueSetting().getFieldSpec(getField().getName()) != null) {+ User user = SecurityUtils.getUser();+ String initialState = OneDev.getInstance(SettingManager.class).getIssueSetting().getInitialStateSpec().getName();+ if (SecurityUtils.canManageIssues(getIssue().getProject())) {+ return true;+ } else {+ return SecurityUtils.canEditIssueField(getIssue().getProject(), getField().getName())+ && user != null+ && user.equals(getIssue().getSubmitter())+ && getIssue().getState().equals(initialState);+ }+ } else {+ return false;+ }+ }+@Overrideprotected void onInitialize() {super.onInitialize();+ WebMarkupContainer link;+ if (canEditField()) {+ link = newInplaceEditLink("edit");+ link.add(AttributeAppender.append("style", "cursor:pointer;"));+ link.add(AttributeAppender.append("class", "editable"));+ } else {+ link = new WebMarkupContainer("edit");+ }+ add(link);+if (getField() != null && !getField().getValues().isEmpty()) {Fragment fragment = new Fragment("content", "nonEmptyValuesFrag", this);+fragment.add(new ListView<String>("values", getField().getValues()) {@Override@@ -130,7 +261,7 @@ public abstract class FieldValuesPanel extends Panel implements EditContext {CommitDetailPage.State commitState = new CommitDetailPage.State();commitState.revision = value;PageParameters params = CommitDetailPage.paramsOf(project, commitState);- Link<Void> hashLink = new ViewStateAwarePageLink<Void>("hashLink", CommitDetailPage.class, params);+ Link<Void> hashLink = new BookmarkablePageLink<Void>("hashLink", CommitDetailPage.class, params);fragment.add(hashLink);hashLink.add(new Label("hash", GitUtils.abbreviateSHA(value)));fragment.add(new CopyToClipboardLink("copyHash", Model.of(value)));@@ -175,7 +306,7 @@ public abstract class FieldValuesPanel extends Panel implements EditContext {}});- add(fragment);+ link.add(fragment);} else if (getField() != null) {FieldSpec fieldSpec = null;if (getField() != null)@@ -186,13 +317,13 @@ public abstract class FieldValuesPanel extends Panel implements EditContext {elsedisplayValue = "Undefined";displayValue = HtmlEscape.escapeHtml5(displayValue);- Label label = new Label("content", "<i>" + displayValue + "</i>");+ Label label = new Label("content", "<i class='mb-2 mr-2'>" + displayValue + "</i>");label.setEscapeModelStrings(false);label.add(AttributeAppender.append("title", getField().getName()));- add(label);+ link.add(label);add(AttributeAppender.append("class", "undefined"));} else {- add(new WebMarkupContainer("content"));+ link.add(new WebMarkupContainer("content"));setVisible(false);}}@@ -207,7 +338,18 @@ public abstract class FieldValuesPanel extends Panel implements EditContext {return null;}}++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(CssHeaderItem.forReference(new FieldValuesCssResourceReference()));+ }+ @Nullable+ protected AttachAjaxIndicatorListener getInplaceEditAjaxIndicator() {+ return null;+ }+protected abstract Issue getIssue();@Nullablediff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/field-values.css b/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/field-values.cssnew file mode 100644index 0000000000..80488c26df--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/field-values.css@@ -0,0 +1,13 @@+.field-values {+ border-bottom: 2px dotted transparent;+}+.field-values.editable {+ cursor: pointer;+}+.field-values.editable:hover {+ border-color: var(--gray);+}+.field-values .icon {+ cursor: pointer;+ display: none;+}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.javaindex f5fa65c399..afdd2113bb 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.java@@ -39,10 +39,10 @@ import io.onedev.server.model.Project;import io.onedev.server.model.support.administration.GlobalIssueSetting;import io.onedev.server.model.support.inputspec.InputContext;import io.onedev.server.model.support.inputspec.InputSpec;+import io.onedev.server.model.support.issue.field.FieldUtils;import io.onedev.server.model.support.issue.field.spec.FieldSpec;import io.onedev.server.search.entity.issue.IssueQuery;import io.onedev.server.security.SecurityUtils;-import io.onedev.server.util.IssueUtils;import io.onedev.server.web.ajaxlistener.DisableGlobalAjaxIndicatorListener;import io.onedev.server.web.behavior.RunTaskBehavior;import io.onedev.server.web.component.project.comment.CommentInput;@@ -178,7 +178,7 @@ abstract class BatchEditPanel extends Panel implements InputContext {});builtInFieldsBean = new BuiltInFieldsBean();- Class<? extends Serializable> fieldBeanClass = IssueUtils.defineFieldBeanClass();+ Class<? extends Serializable> fieldBeanClass = FieldUtils.getFieldBeanClass();Issue issue = new Issue();issue.setProject(getProject());if (getIssueQuery() != null && getIssueQuery().getCriteria() != null) {@@ -191,7 +191,7 @@ abstract class BatchEditPanel extends Panel implements InputContext {} catch (InstantiationException | IllegalAccessException e) {throw new RuntimeException(e);}- IssueUtils.clearFields(customFieldsBean);+ FieldUtils.clearFields(customFieldsBean);}Set<String> excludedProperties = new HashSet<>();@@ -256,7 +256,7 @@ abstract class BatchEditPanel extends Panel implements InputContext {elsemilestone = null;- Map<String, Object> fieldValues = IssueUtils.getFieldValues(customFieldsEditor.newComponentContext(),+ Map<String, Object> fieldValues = FieldUtils.getFieldValues(customFieldsEditor.newComponentContext(),customFieldsBean, selectedFields);OneDev.getInstance(IssueChangeManager.class).batchUpdate(getIssueIterator(), state, milestone, fieldValues, comment);diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.html b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.htmlindex 25b43d793f..5cedd1d8f2 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.html@@ -66,7 +66,7 @@</div></wicket:fragment><wicket:fragment wicket:id="stateFrag">- <span wicket:id="state"></span>+ <div wicket:id="transit" class="state"><span wicket:id="state"></span></div></wicket:fragment><wicket:fragment wicket:id="listFieldsFrag"><div class="issue-list-fields">diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.javaindex bfa2e91a58..211704adfe 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java@@ -4,10 +4,12 @@ import java.io.Serializable;import java.util.ArrayList;import java.util.Collection;import java.util.Comparator;+import java.util.HashSet;import java.util.Iterator;import java.util.LinkedHashMap;import java.util.List;import java.util.Map;+import java.util.Set;import javax.annotation.Nullable;@@ -20,6 +22,7 @@ import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;import org.apache.wicket.ajax.markup.html.AjaxLink;import org.apache.wicket.ajax.markup.html.form.AjaxButton;import org.apache.wicket.behavior.AttributeAppender;+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;import org.apache.wicket.event.Broadcast;import org.apache.wicket.event.IEvent;import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;@@ -63,6 +66,7 @@ import io.onedev.server.model.Issue;import io.onedev.server.model.Project;import io.onedev.server.model.support.LastUpdate;import io.onedev.server.model.support.administration.GlobalIssueSetting;+import io.onedev.server.model.support.issue.TransitionSpec;import io.onedev.server.model.support.issue.field.spec.ChoiceField;import io.onedev.server.model.support.issue.field.spec.DateField;import io.onedev.server.model.support.issue.field.spec.FieldSpec;@@ -79,13 +83,17 @@ import io.onedev.server.util.DateUtils;import io.onedev.server.util.Input;import io.onedev.server.web.WebConstants;import io.onedev.server.web.WebSession;+import io.onedev.server.web.ajaxlistener.AttachAjaxIndicatorListener;+import io.onedev.server.web.ajaxlistener.AttachAjaxIndicatorListener.AttachMode;import io.onedev.server.web.asset.emoji.Emojis;import io.onedev.server.web.behavior.IssueQueryBehavior;import io.onedev.server.web.behavior.NoRecordsBehavior;+import io.onedev.server.web.behavior.WebSocketObserver;import io.onedev.server.web.component.datatable.selectioncolumn.SelectionColumn;import io.onedev.server.web.component.floating.FloatingPanel;import io.onedev.server.web.component.issue.IssueStateBadge;import io.onedev.server.web.component.issue.fieldvalues.FieldValuesPanel;+import io.onedev.server.web.component.issue.operation.TransitionMenuLink;import io.onedev.server.web.component.link.ActionablePageLink;import io.onedev.server.web.component.link.DropdownLink;import io.onedev.server.web.component.link.copytoclipboard.CopyToClipboardLink;@@ -1165,11 +1173,36 @@ public abstract class IssueListPanel extends Panel {if (field.equals(Issue.NAME_STATE)) {Fragment stateFragment = new Fragment(fieldsView.newChildId(),"stateFrag", IssueListPanel.this);- stateFragment.add(new IssueStateBadge("state", rowModel));- fieldsView.add(stateFragment);+ WebMarkupContainer transitLink = new WebMarkupContainer("transit");+ List<TransitionSpec> transitionSpecs = OneDev.getInstance(SettingManager.class)+ .getIssueSetting().getTransitionSpecs();+ if (transitionSpecs.stream().anyMatch(it->it.canTransitManually(issue, null))) {+ transitLink = new TransitionMenuLink("transit") {++ @Override+ protected Issue getIssue() {+ return rowModel.getObject();+ }++ };+ transitLink.add(AttributeAppender.append("class", "transit"));+ } else {+ transitLink = new WebMarkupContainer("transit");+ }++ transitLink.add(new IssueStateBadge("state", rowModel));+ stateFragment.add(transitLink);++ fieldsView.add(stateFragment.setOutputMarkupId(true));} else {fieldsView.add(new FieldValuesPanel(fieldsView.newChildId(), Mode.AVATAR_AND_NAME) {+ @SuppressWarnings("deprecation")+ @Override+ protected AttachAjaxIndicatorListener getInplaceEditAjaxIndicator() {+ return new AttachAjaxIndicatorListener(fieldsView.get(fieldsView.size()-1), AttachMode.APPEND, false);+ }+@Overrideprotected Issue getIssue() {return rowModel.getObject();@@ -1184,7 +1217,7 @@ public abstract class IssueListPanel extends Panel {return null;}- });+ }.setOutputMarkupId(true));}}fragment.add(fieldsView);@@ -1228,6 +1261,30 @@ public abstract class IssueListPanel extends Panel {});issuesTable.addBottomToolbar(new NoRecordsToolbar(issuesTable));issuesTable.add(new NoRecordsBehavior());++ add(new WebSocketObserver() {++ @Override+ public Collection<String> getObservables() {+ Set<String> observables = new HashSet<>();+ ProjectManager projectManager = OneDev.getInstance(ProjectManager.class);+ if (getProject() != null) {+ observables.add(Issue.getListWebSocketObservable(getProject().getId()));+ for (Project project: getProject().getDescendants())+ observables.add(Issue.getListWebSocketObservable(project.getId()));+ } else {+ for (Project project: projectManager.getPermittedProjects(new AccessProject()))+ observables.add(Issue.getListWebSocketObservable(project.getId()));+ }+ return observables;+ }++ @Override+ public void onObservableChanged(IPartialPageRequestHandler handler) {+ handler.add(IssueListPanel.this);+ }++ });setOutputMarkupId(true);}diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/list/issue-list.css b/server-core/src/main/java/io/onedev/server/web/component/issue/list/issue-list.cssindex e0b1ad31c8..a5a30b2357 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/list/issue-list.css+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/list/issue-list.css@@ -17,3 +17,13 @@.issue-list>div>.body tr.issue.new td.new-indicator {background: var(--primary);}++.issue-list .state {+ border-bottom: 2px dotted transparent;+}+.issue-list .state.transit {+ cursor: pointer;+}+.issue-list .state.transit:hover {+ border-color: var(--gray);+}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.html b/server-core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.htmlindex 78ef7c8f93..c8354af4d9 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.html@@ -9,14 +9,4 @@</div><div wicket:id="actionOptions" class="action-options"></div></div>- <wicket:fragment wicket:id="transitionFrag">- <form wicket:id="form" class="state-transition leave-confirm">- <div wicket:id="fields"></div>- <div wicket:id="comment"></div>- <div class="mt-3">- <button wicket:id="save" type="submit" class="btn btn-primary mr-1">Ok</button>- <a wicket:id="cancel" class="btn btn-secondary">Cancel</a>- </div>- </form>- </wicket:fragment></wicket:panel>diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.javaindex 0d60fd60a0..57c686fc66 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.java@@ -1,6 +1,5 @@package io.onedev.server.web.component.issue.operation;-import java.io.Serializable;import java.util.Collection;import java.util.List;import java.util.Map;@@ -8,50 +7,33 @@ import java.util.concurrent.atomic.AtomicReference;import javax.annotation.Nullable;-import org.apache.wicket.AttributeModifier;import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;import org.apache.wicket.ajax.markup.html.AjaxLink;-import org.apache.wicket.ajax.markup.html.form.AjaxButton;import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.form.Form;import org.apache.wicket.markup.html.link.BookmarkablePageLink;-import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.markup.repeater.RepeatingView;import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.model.LoadableDetachableModel;-import org.apache.wicket.model.PropertyModel;-import org.apache.wicket.request.cycle.RequestCycle;import com.google.common.collect.Lists;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.IssueChangeManager;import io.onedev.server.entitymanager.SettingManager;-import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.Issue;-import io.onedev.server.model.Project;-import io.onedev.server.model.User;import io.onedev.server.model.support.issue.TransitionSpec;import io.onedev.server.model.support.issue.transitiontrigger.PressButtonTrigger;-import io.onedev.server.security.SecurityUtils;-import io.onedev.server.util.IssueUtils;-import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;import io.onedev.server.web.behavior.WebSocketObserver;import io.onedev.server.web.component.issue.IssueStateBadge;-import io.onedev.server.web.component.markdown.AttachmentSupport;-import io.onedev.server.web.component.project.comment.CommentInput;-import io.onedev.server.web.editable.BeanContext;-import io.onedev.server.web.editable.BeanEditor;+import io.onedev.server.web.component.issue.transitionoption.TransitionOptionPanel;import io.onedev.server.web.page.project.issues.create.NewIssuePage;-import io.onedev.server.web.util.ProjectAttachmentSupport;@SuppressWarnings("serial")public abstract class IssueOperationsPanel extends Panel {@@ -97,8 +79,6 @@ public abstract class IssueOperationsPanel extends Panel {PressButtonTrigger trigger = (PressButtonTrigger) transition.getTrigger();AjaxLink<Void> link = new AjaxLink<Void>(transitionsView.newChildId()) {- private String comment;-@Overrideprotected void onInitialize() {super.onInitialize();@@ -116,87 +96,40 @@ public abstract class IssueOperationsPanel extends Panel {@Overridepublic void onClick(AjaxRequestTarget target) {activeTransitionLinkRef.set(this);- Fragment fragment = new Fragment(ACTION_OPTIONS_ID, "transitionFrag", IssueOperationsPanel.this);- Class<?> fieldBeanClass = IssueUtils.defineFieldBeanClass();- 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);- }-- };- Collection<String> propertyNames = IssueUtils.getPropertyNames(getIssue().getProject(),- fieldBeanClass, trigger.getPromptFields());- BeanEditor editor = BeanContext.edit("fields", fieldBean, propertyNames, false);- form.add(editor);-- form.add(new CommentInput("comment", new PropertyModel<String>(this, "comment"), false) {+ TransitionOptionPanel transitionOption = new TransitionOptionPanel(ACTION_OPTIONS_ID) {@Override- protected AttachmentSupport getAttachmentSupport() {- return new ProjectAttachmentSupport(getProject(), getIssue().getUUID(),- SecurityUtils.canManageIssues(getProject()));+ protected Issue getIssue() {+ return IssueOperationsPanel.this.getIssue();}@Override- protected Project getProject() {- return getIssue().getProject();+ protected PressButtonTrigger getTrigger() {+ return trigger;}-- @Override- protected List<AttributeModifier> getInputModifiers() {- return Lists.newArrayList(AttributeModifier.replace("placeholder", "Leave a comment"));- }-- @Override- protected List<User> getMentionables() {- return OneDev.getInstance(UserManager.class).queryAndSort(getIssue().getParticipants());- }-- });-- form.add(new AjaxButton("save") {@Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);-- Map<String, Object> fieldValues = IssueUtils.getFieldValues(- editor.newComponentContext(), fieldBean, trigger.getPromptFields());+ protected void onTransit(AjaxRequestTarget target, Map<String, Object> fieldValues,+ String comment) {IssueChangeManager manager = OneDev.getInstance(IssueChangeManager.class);manager.changeState(getIssue(), transition.getToState(), fieldValues,transition.getRemoveFields(), comment);target.add(IssueOperationsPanel.this);}-- });- form.add(new AjaxLink<Void>("cancel") {@Override- public void onClick(AjaxRequestTarget target) {+ protected void onCancel(AjaxRequestTarget target) {newEmptyActionOptions(target);activeTransitionLinkRef.set(null);for (Component each: transitionsView)target.add(each);}- @Override- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {- super.updateAjaxAttributes(attributes);- attributes.getAjaxCallListeners().add(new ConfirmLeaveListener());- }-- });- fragment.add(form);+ };- fragment.setOutputMarkupId(true);- IssueOperationsPanel.this.replace(fragment);- target.add(fragment);+ IssueOperationsPanel.this.replace(transitionOption);+ target.add(transitionOption);for (Component each: transitionsView)target.add(each);diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/operation/TransitionMenuLink.java b/server-core/src/main/java/io/onedev/server/web/component/issue/operation/TransitionMenuLink.javanew file mode 100644index 0000000000..57239dcb4a--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/operation/TransitionMenuLink.java@@ -0,0 +1,105 @@+package io.onedev.server.web.component.issue.operation;++import java.util.ArrayList;+import java.util.List;+import java.util.Map;++import org.apache.wicket.Component;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.markup.html.WebMarkupContainer;++import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.IssueChangeManager;+import io.onedev.server.entitymanager.SettingManager;+import io.onedev.server.model.Issue;+import io.onedev.server.model.support.issue.TransitionSpec;+import io.onedev.server.model.support.issue.transitiontrigger.PressButtonTrigger;+import io.onedev.server.web.component.floating.FloatingPanel;+import io.onedev.server.web.component.issue.transitionoption.TransitionOptionPanel;+import io.onedev.server.web.component.menu.MenuItem;+import io.onedev.server.web.component.menu.MenuLink;+import io.onedev.server.web.component.modal.ModalLink;+import io.onedev.server.web.component.modal.ModalPanel;++@SuppressWarnings("serial")+public abstract class TransitionMenuLink extends MenuLink {++ public TransitionMenuLink(String id) {+ super(id);+ }++ @Override+ protected List<MenuItem> getMenuItems(FloatingPanel dropdown) {+ List<MenuItem> menuItems = new ArrayList<>();++ List<TransitionSpec> transitions = OneDev.getInstance(SettingManager.class).getIssueSetting().getTransitionSpecs();++ for (TransitionSpec transition: transitions) {+ if (transition.canTransitManually(getIssue(), null)) {+ PressButtonTrigger trigger = (PressButtonTrigger) transition.getTrigger();+ menuItems.add(new MenuItem() {++ @Override+ public String getLabel() {+ return trigger.getButtonLabel();+ }++ @Override+ public WebMarkupContainer newLink(String id) {+ return new ModalLink(id) {++ @Override+ protected String getModalCssClass() {+ return "modal-lg";+ }++ @Override+ public void onClick(AjaxRequestTarget target) {+ super.onClick(target);+ dropdown.close();+ }++ @Override+ protected Component newContent(String id, ModalPanel modal) {+ return new TransitionOptionPanel(id) {++ @Override+ protected Issue getIssue() {+ return TransitionMenuLink.this.getIssue();+ }++ @Override+ protected PressButtonTrigger getTrigger() {+ return trigger;+ }++ @Override+ protected void onTransit(AjaxRequestTarget target, Map<String, Object> fieldValues,+ String comment) {+ IssueChangeManager manager = OneDev.getInstance(IssueChangeManager.class);+ manager.changeState(getIssue(), transition.getToState(), fieldValues,+ transition.getRemoveFields(), comment);+ modal.close();+ }++ @Override+ protected void onCancel(AjaxRequestTarget target) {+ modal.close();+ }++ };+ }++ };+ }++ });+ }+ }++ return menuItems;+ }++ protected abstract Issue getIssue();++}diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.html b/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.htmlindex 959ac26683..4557deae2b 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.html@@ -1,6 +1,15 @@<wicket:panel><div class="issue-side">- <div wicket:id="fields" class="fields"></div>+ <div class="fields">+ <div class="body">+ <table>+ <tr wicket:id="fields">+ <td class="name"><span wicket:id="name"></span></td>+ <td class="values d-flex flex-nowrap"><div wicket:id="values"></div></td>+ </tr>+ </table>+ </div>+ </div><div class="milestone"><div class="head">Milestone</div><div wicket:id="milestone" class="body"></div>@@ -32,30 +41,6 @@<wicket:fragment wicket:id="nonEmptyValuesFrag"><div wicket:id="values" class="value"><span wicket:id="value"></span></div></wicket:fragment>- <wicket:fragment wicket:id="fieldsViewFrag">- <div class="body">- <table>- <tr wicket:id="fields">- <td class="name"><span wicket:id="name"></span></td>- <td class="values"><div wicket:id="values"></div></td>- </tr>- </table>- </div>- <wicket:enclosure>- <div class="d-flex align-items-center mt-3">- <a wicket:id="edit" class="btn btn-light btn-xs btn-icon btn-hover-primary edit" title="Edit fields"><wicket:svg href="edit" class="icon mr-2"></wicket:svg></a>- </div>- </wicket:enclosure>- </wicket:fragment>- <wicket:fragment wicket:id="fieldsEditFrag">- <form wicket:id="form" class="fields-edit leave-confirm">- <div wicket:id="editor"></div>- <div class="mt-4">- <input wicket:id="save" type="submit" class="dirty-aware btn btn-primary mr-1" value="Save">- <a wicket:id="cancel" class="btn btn-secondary">Cancel</a>- </div>- </form>- </wicket:fragment><wicket:fragment wicket:id="milestoneViewFrag"><div class="d-flex align-items-center"><a wicket:id="link" class="mr-3"><span wicket:id="label"></span></a>diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.javaindex 479f41eb92..92e1f53048 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.java@@ -1,6 +1,5 @@package io.onedev.server.web.component.issue.side;-import java.io.Serializable;import java.util.ArrayList;import java.util.Collection;import java.util.Collections;@@ -13,7 +12,6 @@ import java.util.stream.Collectors;import org.apache.wicket.Component;import org.apache.wicket.RestartResponseAtInterceptPageException;import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;import org.apache.wicket.ajax.markup.html.AjaxLink;import org.apache.wicket.ajax.markup.html.form.AjaxButton;import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;@@ -41,7 +39,6 @@ import io.onedev.server.OneDev;import io.onedev.server.entitymanager.IssueChangeManager;import io.onedev.server.entitymanager.IssueVoteManager;import io.onedev.server.entitymanager.IssueWatchManager;-import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.entityreference.Referenceable;import io.onedev.server.model.AbstractEntity;import io.onedev.server.model.Issue;@@ -51,13 +48,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.administration.GlobalIssueSetting;import io.onedev.server.search.entity.issue.IssueQuery;import io.onedev.server.search.entity.issue.StateCriteria;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.Input;-import io.onedev.server.util.IssueUtils;-import io.onedev.server.web.ajaxlistener.AppendAjaxIndicatorListener;+import io.onedev.server.web.ajaxlistener.AttachAjaxIndicatorListener;import io.onedev.server.web.behavior.WebSocketObserver;import io.onedev.server.web.component.entity.reference.ReferencePanel;import io.onedev.server.web.component.entity.watches.EntityWatchesPanel;@@ -69,8 +64,6 @@ import io.onedev.server.web.component.milestone.choice.MilestoneSingleChoice;import io.onedev.server.web.component.user.ident.Mode;import io.onedev.server.web.component.user.ident.UserIdentPanel;import io.onedev.server.web.component.user.list.SimpleUserListLink;-import io.onedev.server.web.editable.BeanContext;-import io.onedev.server.web.editable.BeanEditor;import io.onedev.server.web.page.project.issues.milestones.MilestoneIssuesPage;import io.onedev.server.web.page.simple.security.LoginPage;@@ -160,18 +153,7 @@ public abstract class IssueSidePanel extends Panel {}};- Fragment fragment = new Fragment("fields", "fieldsViewFrag", this) {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(!fieldsModel.getObject().isEmpty());- }-- };- fragment.setOutputMarkupId(true);-- fragment.add(new ListView<Input>("fields", fieldsModel) {+ return new ListView<Input>("fields", fieldsModel) {@Overrideprotected void populateItem(ListItem<Input> item) {@@ -179,6 +161,11 @@ public abstract class IssueSidePanel extends Panel {item.add(new Label("name", field.getName()));item.add(new FieldValuesPanel("values", Mode.NAME) {+ @Override+ protected AttachAjaxIndicatorListener getInplaceEditAjaxIndicator() {+ return new AttachAjaxIndicatorListener(false);+ }+@Overrideprotected Issue getIssue() {return IssueSidePanel.this.getIssue();@@ -192,93 +179,13 @@ public abstract class IssueSidePanel extends Panel {}.setRenderBodyOnly(true));}- });-- fragment.add(new AjaxLink<Void>("edit") {-- @Override- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {- super.updateAjaxAttributes(attributes);- attributes.getAjaxCallListeners().add(new AppendAjaxIndicatorListener(false));- }-@Overrideprotected void onConfigure() {super.onConfigure();- User user = SecurityUtils.getUser();- String initialState = OneDev.getInstance(SettingManager.class).getIssueSetting().getInitialStateSpec().getName();- if (SecurityUtils.canManageIssues(getProject())) {- setVisible(true);- } else {- GlobalIssueSetting setting = OneDev.getInstance(SettingManager.class).getIssueSetting();- boolean hasEditableFields = false;- for (String fieldName: setting.getFieldNames()) {- if (SecurityUtils.canEditIssueField(getProject(), fieldName)) {- hasEditableFields = true;- break;- }- }- setVisible(hasEditableFields- && user != null- && user.equals(getIssue().getSubmitter())- && getIssue().getState().equals(initialState));- }- }-- @Override- public void onClick(AjaxRequestTarget target) {- Fragment fragment = new Fragment("fields", "fieldsEditFrag", IssueSidePanel.this);- Form<?> form = new Form<Void>("form");-- Class<?> fieldBeanClass = IssueUtils.defineFieldBeanClass();- Serializable fieldBean = getIssue().getFieldBean(fieldBeanClass, true);-- Collection<String> propertyNames = IssueUtils.getPropertyNames(getIssue().getProject(),- fieldBeanClass, getIssue().getFieldNames());- BeanEditor beanEditor = BeanContext.edit("editor", fieldBean, propertyNames, false);- form.add(beanEditor);-- form.add(new AjaxButton("save") {-- @Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);-- Map<String, Object> fieldValues = IssueUtils.getFieldValues(beanEditor.newComponentContext(), fieldBean, getIssue().getFieldNames());- OneDev.getInstance(IssueChangeManager.class).changeFields(getIssue(), fieldValues);- Component fieldsContainer = newFieldsContainer();- IssueSidePanel.this.replace(fieldsContainer);- target.add(fieldsContainer);- }-- @Override- protected void onError(AjaxRequestTarget target, Form<?> form) {- super.onError(target, form);- target.add(fragment);- }-- });-- form.add(new AjaxLink<Void>("cancel") {-- @Override- public void onClick(AjaxRequestTarget target) {- Component fieldsContainer = newFieldsContainer();- IssueSidePanel.this.replace(fieldsContainer);- target.add(fieldsContainer);- }-- });- fragment.add(form);- fragment.setOutputMarkupId(true);-- IssueSidePanel.this.replace(fragment);- target.add(fragment);+ setVisible(!fieldsModel.getObject().isEmpty());}- });-- return fragment;+ };}private Component newMilestoneContainer() {diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/side/issue-side.css b/server-core/src/main/java/io/onedev/server/web/component/issue/side/issue-side.cssindex 435b0de4da..7958f4d3cb 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/side/issue-side.css+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/side/issue-side.css@@ -26,3 +26,12 @@.issue-side>.fields>.body>table>tbody>tr:last-child>td {padding-bottom: 0;}+.issue-side>.fields .field-values {+ flex-grow: 1;+}+.issue-side>.fields .field-values.editable:not(.with-working-indicator) .icon {+ display: inline;+}+.issue-side>.fields .field-values.editable {+ border-color: transparent;+}diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/transitionoption/TransitionOptionPanel.html b/server-core/src/main/java/io/onedev/server/web/component/issue/transitionoption/TransitionOptionPanel.htmlnew file mode 100644index 0000000000..e7e8702ffc--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/transitionoption/TransitionOptionPanel.html@@ -0,0 +1,16 @@+<wicket:panel>+ <form wicket:id="form" class="transition-option">+ <div class="modal-header">+ <h5 wicket:id="title" class="modal-title"></h5>+ <button wicket:id="close" type="button" class="close"><wicket:svg href="times" class="icon"/></button>+ </div>+ <div class="modal-body">+ <div wicket:id="fields"></div>+ <div wicket:id="comment"></div>+ </div>+ <div class="modal-footer">+ <button wicket:id="ok" class="btn btn-primary">Ok</button>+ <button wicket:id="cancel" class="btn btn-secondary">Cancel</button>+ </div>+ </form>+</wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/transitionoption/TransitionOptionPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/transitionoption/TransitionOptionPanel.javanew file mode 100644index 0000000000..c1ca29f56e--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/transitionoption/TransitionOptionPanel.java@@ -0,0 +1,153 @@+package io.onedev.server.web.component.issue.transitionoption;++import java.io.Serializable;+import java.util.Collection;+import java.util.List;+import java.util.Map;++import javax.annotation.Nullable;++import org.apache.wicket.AttributeModifier;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;+import org.apache.wicket.ajax.markup.html.AjaxLink;+import org.apache.wicket.ajax.markup.html.form.AjaxButton;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.form.Form;+import org.apache.wicket.markup.html.panel.Panel;+import org.apache.wicket.model.PropertyModel;+import org.apache.wicket.request.cycle.RequestCycle;++import com.google.common.collect.Lists;++import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.UserManager;+import io.onedev.server.model.Issue;+import io.onedev.server.model.Project;+import io.onedev.server.model.User;+import io.onedev.server.model.support.issue.field.FieldUtils;+import io.onedev.server.model.support.issue.transitiontrigger.PressButtonTrigger;+import io.onedev.server.security.SecurityUtils;+import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;+import io.onedev.server.web.component.markdown.AttachmentSupport;+import io.onedev.server.web.component.project.comment.CommentInput;+import io.onedev.server.web.editable.BeanContext;+import io.onedev.server.web.editable.BeanEditor;+import io.onedev.server.web.util.ProjectAttachmentSupport;++@SuppressWarnings("serial")+public abstract class TransitionOptionPanel extends Panel {++ private String comment;++ public TransitionOptionPanel(String id) {+ super(id);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ Class<?> fieldBeanClass = FieldUtils.getFieldBeanClass();+ 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);+ }++ };++ add(form);++ form.add(new Label("title", "Issue Transition (" + getTrigger().getButtonLabel() + ")"));++ Collection<String> propertyNames = FieldUtils.getEditablePropertyNames(getIssue().getProject(),+ fieldBeanClass, getTrigger().getPromptFields());+ BeanEditor editor = BeanContext.edit("fields", fieldBean, propertyNames, false);+ form.add(editor);++ form.add(new CommentInput("comment", new PropertyModel<String>(this, "comment"), false) {++ @Override+ protected AttachmentSupport getAttachmentSupport() {+ return new ProjectAttachmentSupport(getProject(), getIssue().getUUID(),+ SecurityUtils.canManageIssues(getProject()));+ }++ @Override+ protected Project getProject() {+ return getIssue().getProject();+ }++ @Override+ protected List<AttributeModifier> getInputModifiers() {+ return Lists.newArrayList(AttributeModifier.replace("placeholder", "Leave a comment"));+ }++ @Override+ protected List<User> getMentionables() {+ return OneDev.getInstance(UserManager.class).queryAndSort(getIssue().getParticipants());+ }++ });++ form.add(new AjaxButton("ok") {++ @Override+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {+ super.onSubmit(target, form);++ Collection<String> editableFields = FieldUtils.getEditableFields(+ getIssue().getProject(), getTrigger().getPromptFields());+ Map<String, Object> fieldValues = FieldUtils.getFieldValues(+ editor.newComponentContext(), fieldBean, editableFields);+ onTransit(target, fieldValues, comment);+ }++ });+ form.add(new AjaxLink<Void>("cancel") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ onCancel(target);+ }++ @Override+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {+ super.updateAjaxAttributes(attributes);+ attributes.getAjaxCallListeners().add(new ConfirmLeaveListener());+ }++ });++ form.add(new AjaxLink<Void>("close") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ onCancel(target);+ }++ @Override+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {+ super.updateAjaxAttributes(attributes);+ attributes.getAjaxCallListeners().add(new ConfirmLeaveListener());+ }++ });++ setOutputMarkupId(true);+ }++ protected abstract Issue getIssue();++ protected abstract PressButtonTrigger getTrigger();++ protected abstract void onTransit(AjaxRequestTarget target, Map<String, Object> fieldValues, @Nullable String comment);++ protected abstract void onCancel(AjaxRequestTarget target);++}diff --git a/server-core/src/main/java/io/onedev/server/web/component/select2/AbstractSelect2Choice.java b/server-core/src/main/java/io/onedev/server/web/component/select2/AbstractSelect2Choice.javaindex 97936453b5..20a268aa29 100644--- a/server-core/src/main/java/io/onedev/server/web/component/select2/AbstractSelect2Choice.java+++ b/server-core/src/main/java/io/onedev/server/web/component/select2/AbstractSelect2Choice.java@@ -20,6 +20,7 @@ import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.event.IEvent;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.head.JavaScriptHeaderItem;+import org.apache.wicket.markup.head.OnDomReadyHeaderItem;import org.apache.wicket.markup.head.OnLoadHeaderItem;import org.apache.wicket.markup.html.form.HiddenField;import org.apache.wicket.model.IModel;@@ -31,6 +32,8 @@ import org.apache.wicket.util.string.Strings;import org.json.JSONException;import org.json.JSONWriter;+import io.onedev.server.web.editable.InplacePropertyEditPanel;+/*** Base class for Select2 components*@@ -158,10 +161,15 @@ abstract class AbstractSelect2Choice<T, M> extends HiddenField<M> implements IRe// initialize select2response.render(JavaScriptHeaderItem.forReference(new Select2ResourceReference()));- // Use OnLoad instead of OnDomReady here as otherwise the placeholder- // of multi-choice can not be displayed in a modal dialog- response.render(OnLoadHeaderItem.forScript(JQuery.execute("$('#%s').select2(%s);",- getJquerySafeMarkupId(), settings.toJson())));+ if (findParent(InplacePropertyEditPanel.class) != null) {+ response.render(OnDomReadyHeaderItem.forScript(JQuery.execute("$('#%s').select2(%s);",+ getJquerySafeMarkupId(), settings.toJson())));+ } else {+ // Use OnLoad instead of OnDomReady here as otherwise the placeholder+ // of multi-choice can not be displayed in a modal dialog+ response.render(OnLoadHeaderItem.forScript(JQuery.execute("$('#%s').select2(%s);",+ getJquerySafeMarkupId(), settings.toJson())));+ }// select current valuediff --git a/server-core/src/main/java/io/onedev/server/web/component/select2/res/select2.js b/server-core/src/main/java/io/onedev/server/web/component/select2/res/select2.jsindex 7decda6853..c9c1e96e2d 100644--- a/server-core/src/main/java/io/onedev/server/web/component/select2/res/select2.js+++ b/server-core/src/main/java/io/onedev/server/web/component/select2/res/select2.js@@ -948,8 +948,16 @@ the specific language governing permissions and limitations under the Apache Lic// so here we trigger the blur event manually if so desiredif (this.opts.blurOnChange)this.opts.element.blur();++ this.align(this.container);},+ align: function(container) {+ var $floating = $(container).closest(".floating");+ if ($floating.length != 0 && $floating.data("afterElementReplace"))+ $floating.data("afterElementReplace")();+ },+// abstractenable: function() {if (this.enabled) return;@@ -1036,6 +1044,8 @@ the specific language governing permissions and limitations under the Apache Lic}, evaluate(this.opts.dropdownCss));this.dropdown.css(css);++ this.align(this.container);},// abstract@@ -1178,6 +1188,8 @@ the specific language governing permissions and limitations under the Apache Licthis.clearSearch();this.search.removeClass("select2-active");this.opts.element.trigger($.Event("close"));++ this.align(this.container);},// abstract@@ -1794,7 +1806,6 @@ the specific language governing permissions and limitations under the Apache Licthis.initContainerWidth();this.setPlaceholder();-},// singlediff --git a/server-core/src/main/java/io/onedev/server/web/editable/BeanDescriptor.java b/server-core/src/main/java/io/onedev/server/web/editable/BeanDescriptor.javaindex 75e3e94adb..67b7ed1b81 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/BeanDescriptor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/BeanDescriptor.java@@ -87,10 +87,11 @@ public class BeanDescriptor implements Serializable {}@Nullable- public PropertyDescriptor getProperty(String propertyName) {+ public PropertyDescriptor getProperty(String propertyNameOrDisplayName) {for (List<PropertyDescriptor> groupProperties: getProperties().values()) {for (PropertyDescriptor property: groupProperties) {- if (property.getPropertyName().equals(propertyName))+ String displayName = property.getDisplayName();+ if (property.getPropertyName().equals(propertyNameOrDisplayName) || displayName.equals(propertyNameOrDisplayName))return property;}}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/BeanEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/BeanEditor.javaindex 0992b3a465..96db799f29 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/BeanEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/BeanEditor.java@@ -78,6 +78,10 @@ public class BeanEditor extends ValueEditor<Serializable> {return false;}+ private boolean hasTransitiveDependency(String dependentPropertyName, String dependencyPropertyName) {+ return hasTransitiveDependency(dependentPropertyName, dependencyPropertyName, new HashSet<>());+ }+@Overridepublic void onEvent(IEvent<?> event) {super.onEvent(event);@@ -91,9 +95,7 @@ public class BeanEditor extends ValueEditor<Serializable> {@SuppressWarnings("unchecked")PropertyContext<Serializable> propertyContext =(PropertyContext<Serializable>) propertyContainer.getDefaultModelObject();- Set<String> checkedPropertyNames = new HashSet<>();- if (hasTransitiveDependency(propertyContext.getPropertyName(),- propertyUpdating.getPropertyName(), checkedPropertyNames)) {+ if (hasTransitiveDependency(propertyContext.getPropertyName(), propertyUpdating.getPropertyName())) {/** Create new property container instead of simply refreshing it as some dependent* properties may only take effect when re-create the property container. For instance@@ -178,7 +180,7 @@ public class BeanEditor extends ValueEditor<Serializable> {*/String propertyName = descriptor.getPropertyName(name);property.getDescriptor().getDependencyPropertyNames().add(propertyName);-+Optional<Object> result= BeanEditor.this.visitChildren(PropertyEditor.class, new IVisitor<PropertyEditor<?>, Optional<Object>>() {@Override@@ -190,7 +192,7 @@ public class BeanEditor extends ValueEditor<Serializable> {}});- if (result == null)+ if (result == null)return getPropertyContext(propertyName).getDescriptor().getPropertyValue(getModelObject());elsereturn result.orElse(null);diff --git a/server-core/src/main/java/io/onedev/server/web/editable/InplacePropertyEditLink.java b/server-core/src/main/java/io/onedev/server/web/editable/InplacePropertyEditLink.javanew file mode 100644index 0000000000..262f8bd4c7--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/editable/InplacePropertyEditLink.java@@ -0,0 +1,50 @@+package io.onedev.server.web.editable;++import java.io.Serializable;++import org.apache.wicket.Component;+import org.apache.wicket.behavior.AttributeAppender;+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;++import io.onedev.server.web.component.floating.AlignPlacement;+import io.onedev.server.web.component.floating.FloatingPanel;+import io.onedev.server.web.component.link.DropdownLink;++@SuppressWarnings("serial")+public abstract class InplacePropertyEditLink extends DropdownLink {++ public InplacePropertyEditLink(String id) {+ super(id, new AlignPlacement(0, 0, 0, 0));+ }++ @Override+ protected void onInitialize(FloatingPanel dropdown) {+ super.onInitialize(dropdown);+ dropdown.add(AttributeAppender.append("class", "inplace-property-edit"));+ }++ @Override+ protected Component newContent(String id, FloatingPanel dropdown) {+ return new InplacePropertyEditPanel<Serializable>(id, getBean(), getPropertyName()) {++ @Override+ protected void onUpdated(IPartialPageRequestHandler handler, Serializable bean, String propertyName) {+ InplacePropertyEditLink.this.onUpdated(handler, bean, propertyName);+ dropdown.close();+ }++ @Override+ protected void onCancelled(IPartialPageRequestHandler handler) {+ dropdown.close();+ }++ };+ }++ protected abstract Serializable getBean();++ protected abstract String getPropertyName();++ protected abstract void onUpdated(IPartialPageRequestHandler handler, Serializable bean, String propertyName);++}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/InplacePropertyEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/InplacePropertyEditPanel.htmlnew file mode 100644index 0000000000..f5d6b7ab56--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/editable/InplacePropertyEditPanel.html@@ -0,0 +1,10 @@+<wicket:panel>+ <form wicket:id="form">+ <div wicket:id="property" class="property"></div>+ <div wicket:id="feedback" class="mt-3 m-1"></div>+ <div wicket:id="confirm" class="d-flex justify-content-between mt-3 m-1">+ <input wicket:id="save" type="submit" class="dirty-aware btn btn-sm btn-primary mr-4" value="Save">+ <a wicket:id="cancel" class="btn btn-sm btn-secondary">Cancel</a>+ </div>+ </form>+</wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/editable/InplacePropertyEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/InplacePropertyEditPanel.javanew file mode 100644index 0000000000..1cb16edb9e--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/editable/InplacePropertyEditPanel.java@@ -0,0 +1,108 @@+package io.onedev.server.web.editable;++import java.io.Serializable;++import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.markup.html.AjaxLink;+import org.apache.wicket.ajax.markup.html.form.AjaxButton;+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;+import org.apache.wicket.event.IEvent;+import org.apache.wicket.feedback.FencedFeedbackPanel;+import org.apache.wicket.markup.html.WebMarkupContainer;+import org.apache.wicket.markup.html.form.Form;+import org.apache.wicket.markup.html.panel.Panel;++import io.onedev.server.util.EditContext;++@SuppressWarnings("serial")+public abstract class InplacePropertyEditPanel<T> extends Panel implements EditContext {++ private final Serializable bean;++ private final String propertyName;++ private final BeanDescriptor beanDescriptor;++ private PropertyEditor<?> propertyEditor;++ public InplacePropertyEditPanel(String id, Serializable bean, String propertyName) {+ super(id);+ this.beanDescriptor = new BeanDescriptor(bean.getClass());+ this.bean = bean;+ this.propertyName = propertyName;+ }++ @Override+ public Object getInputValue(String name) {+ return beanDescriptor.getProperty(name).getPropertyValue(bean);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ Form<?> form = new Form<Void>("form");+ form.setOutputMarkupId(true);++ form.add(propertyEditor = PropertyContext.edit("property", bean, propertyName));+ form.add(new FencedFeedbackPanel("feedback", propertyEditor) {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(propertyEditor.hasErrorMessage());+ }++ });++ WebMarkupContainer confirm = new WebMarkupContainer("confirm");+ confirm.setVisible(propertyEditor.needExplicitSubmit());+ add(confirm);++ confirm.add(new AjaxButton("save") {++ @Override+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {+ super.onSubmit(target, form);+ onUpdated(target, bean, propertyName);+ }++ @Override+ protected void onError(AjaxRequestTarget target, Form<?> form) {+ super.onError(target, form);+ target.add(form);+ }++ });+ confirm.add(new AjaxLink<Void>("cancel") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ onCancelled(target);+ }++ });+ form.add(confirm);++ add(form);+ }++ @Override+ public void onEvent(IEvent<?> event) {+ super.onEvent(event);++ if (event.getPayload() instanceof PropertyUpdating) {+ event.stop();+ if (!propertyEditor.needExplicitSubmit()) {+ propertyEditor.getDescriptor().setPropertyValue(bean, propertyEditor.getConvertedInput());+ onUpdated(((PropertyUpdating) event.getPayload()).getHandler(), bean, propertyName);+ }+ }++ }++ protected abstract void onUpdated(IPartialPageRequestHandler handler, Serializable bean, String propertyName);++ protected abstract void onCancelled(IPartialPageRequestHandler handler);++}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/PropertyEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/PropertyEditor.javaindex d288d58ac9..8d3e78fb9f 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/PropertyEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/PropertyEditor.java@@ -112,4 +112,6 @@ public abstract class PropertyEditor<T> extends ValueEditor<T> {return descriptor;}+ public abstract boolean needExplicitSubmit();+}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/agentquery/AgentQueryEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/agentquery/AgentQueryEditPanel.javaindex 4455ee656f..201a953cb4 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/agentquery/AgentQueryEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/agentquery/AgentQueryEditPanel.java@@ -86,4 +86,9 @@ public class AgentQueryEditPanel extends PropertyEditor<String> {return input.getConvertedInput();}+ @Override+ public boolean needExplicitSubmit() {+ return true;+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/bean/BeanPropertyEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/bean/BeanPropertyEditor.javaindex da1a9d792e..d0620532e5 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/bean/BeanPropertyEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/bean/BeanPropertyEditor.java@@ -156,4 +156,9 @@ public class BeanPropertyEditor extends PropertyEditor<Serializable> {return null;}+ @Override+ public boolean needExplicitSubmit() {+ return true;+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.javaindex 61eea144c9..d0c5fe983b 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.java@@ -349,5 +349,10 @@ public class BeanListPropertyEditor extends PropertyEditor<List<Serializable>> {}return newList;}++ @Override+ public boolean needExplicitSubmit() {+ return true;+ }}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/bool/BooleanPropertyEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/bool/BooleanPropertyEditor.javaindex 1abf9a2438..d51ff2f228 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/bool/BooleanPropertyEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/bool/BooleanPropertyEditor.java@@ -41,4 +41,9 @@ public class BooleanPropertyEditor extends PropertyEditor<Boolean> {return input.getConvertedInput();}+ @Override+ public boolean needExplicitSubmit() {+ return false;+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/bool/NullableBooleanPropertyEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/bool/NullableBooleanPropertyEditor.javaindex 446e9a3615..b8d444f8e8 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/bool/NullableBooleanPropertyEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/bool/NullableBooleanPropertyEditor.java@@ -62,4 +62,9 @@ public class NullableBooleanPropertyEditor extends PropertyEditor<Boolean> {return null;}+ @Override+ public boolean needExplicitSubmit() {+ return false;+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/branchchoice/BranchMultiChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/branchchoice/BranchMultiChoiceEditor.javaindex ebe8031084..10cc758f2e 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/branchchoice/BranchMultiChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/branchchoice/BranchMultiChoiceEditor.java@@ -86,4 +86,9 @@ public class BranchMultiChoiceEditor extends PropertyEditor<List<String>> {return projectAndBranches;}+ @Override+ public boolean needExplicitSubmit() {+ return true;+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/branchchoice/BranchSingleChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/branchchoice/BranchSingleChoiceEditor.javaindex 8779d568e4..a2439a7da9 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/branchchoice/BranchSingleChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/branchchoice/BranchSingleChoiceEditor.java@@ -75,4 +75,9 @@ public class BranchSingleChoiceEditor extends PropertyEditor<String> {return input.getConvertedInput();}+ @Override+ public boolean needExplicitSubmit() {+ return false;+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/build/choice/BuildMultiChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/build/choice/BuildMultiChoiceEditor.javaindex 5753934be9..8e02e945d7 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/build/choice/BuildMultiChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/build/choice/BuildMultiChoiceEditor.java@@ -20,7 +20,7 @@ import io.onedev.server.web.component.build.choice.BuildChoiceProvider;import io.onedev.server.web.component.build.choice.BuildMultiChoice;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;-import io.onedev.server.web.page.project.ProjectPage;+import io.onedev.server.web.util.ProjectAware;@SuppressWarnings("serial")public class BuildMultiChoiceEditor extends PropertyEditor<List<Long>> {@@ -33,8 +33,9 @@ public class BuildMultiChoiceEditor extends PropertyEditor<List<Long>> {}private Project getProject() {- if (getPage() instanceof ProjectPage)- return ((ProjectPage)getPage()).getProject();+ ProjectAware projectAware = findParent(ProjectAware.class);+ if (projectAware != null)+ return projectAware.getProject();elsereturn null;}@@ -95,4 +96,9 @@ public class BuildMultiChoiceEditor extends PropertyEditor<List<Long>> {return new ArrayList<>();}+ @Override+ public boolean needExplicitSubmit() {+ return true;+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/build/choice/BuildSingleChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/build/choice/BuildSingleChoiceEditor.javaindex 82db5f5290..9aa31a006a 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/build/choice/BuildSingleChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/build/choice/BuildSingleChoiceEditor.java@@ -15,7 +15,7 @@ import io.onedev.server.web.component.build.choice.BuildChoiceProvider;import io.onedev.server.web.component.build.choice.BuildSingleChoice;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;-import io.onedev.server.web.page.project.ProjectPage;+import io.onedev.server.web.util.ProjectAware;@SuppressWarnings("serial")public class BuildSingleChoiceEditor extends PropertyEditor<Long> {@@ -28,8 +28,9 @@ public class BuildSingleChoiceEditor extends PropertyEditor<Long> {}private Project getProject() {- if (getPage() instanceof ProjectPage)- return ((ProjectPage)getPage()).getProject();+ ProjectAware projectAware = findParent(ProjectAware.class);+ if (projectAware != null)+ return projectAware.getProject();elsereturn null;}@@ -86,4 +87,9 @@ public class BuildSingleChoiceEditor extends PropertyEditor<Long> {return null;}+ @Override+ public boolean needExplicitSubmit() {+ return false;+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/imports/ImportListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/imports/ImportListEditPanel.javaindex 06fad50581..13d33a6cd1 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/imports/ImportListEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/imports/ImportListEditPanel.java@@ -146,5 +146,10 @@ class ImportListEditPanel extends PropertyEditor<List<Serializable>> {super.renderHead(response);response.render(CssHeaderItem.forReference(new ImportCssResourceReference()));}++ @Override+ public boolean needExplicitSubmit() {+ return true;+ }}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/choice/JobMultiChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/choice/JobMultiChoiceEditor.javaindex 9cbfc12117..c344f2e3a6 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/choice/JobMultiChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/choice/JobMultiChoiceEditor.java@@ -70,4 +70,9 @@ public class JobMultiChoiceEditor extends PropertyEditor<List<String>> {return null;}+ @Override+ public boolean needExplicitSubmit() {+ return true;+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/choice/JobSingleChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/choice/JobSingleChoiceEditor.javaindex 2c43728c69..fc69dc7e4a 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/choice/JobSingleChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/choice/JobSingleChoiceEditor.java@@ -58,4 +58,9 @@ public class JobSingleChoiceEditor extends PropertyEditor<String> {return input.getConvertedInput();}+ @Override+ public boolean needExplicitSubmit() {+ return false;+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/jobdependency/JobDependencyListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/jobdependency/JobDependencyListEditPanel.javaindex 0594cb1604..22d9cf13f4 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/jobdependency/JobDependencyListEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/jobdependency/JobDependencyListEditPanel.java@@ -281,4 +281,9 @@ class JobDependencyListEditPanel extends PropertyEditor<List<Serializable>> {return value;}+ @Override+ public boolean needExplicitSubmit() {+ return true;+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/postbuildaction/PostBuildActionListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/postbuildaction/PostBuildActionListEditPanel.javaindex 4772993ae4..8c742e0507 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/postbuildaction/PostBuildActionListEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/postbuildaction/PostBuildActionListEditPanel.java@@ -271,4 +271,9 @@ class PostBuildActionListEditPanel extends PropertyEditor<List<Serializable>> {return value;}+ @Override+ public boolean needExplicitSubmit() {+ return true;+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/projectdependency/ProjectDependencyListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/projectdependency/ProjectDependencyListEditPanel.javaindex 13f908f4e8..f9938f810c 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/projectdependency/ProjectDependencyListEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/projectdependency/ProjectDependencyListEditPanel.java@@ -282,4 +282,9 @@ class ProjectDependencyListEditPanel extends PropertyEditor<List<Serializable>>response.render(CssHeaderItem.forReference(new ProjectDependencyCssResourceReference()));}+ @Override+ public boolean needExplicitSubmit() {+ return true;+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/trigger/JobTriggerListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/trigger/JobTriggerListEditPanel.javaindex bc1b613a02..135f5d78d3 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/trigger/JobTriggerListEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/trigger/JobTriggerListEditPanel.java@@ -252,4 +252,9 @@ class JobTriggerListEditPanel extends PropertyEditor<List<Serializable>> {return value;}+ @Override+ public boolean needExplicitSubmit() {+ return true;+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/spec/ParamSpecListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/spec/ParamSpecListEditPanel.javaindex 562847f9ce..dcad76efbe 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/spec/ParamSpecListEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/spec/ParamSpecListEditPanel.java@@ -230,5 +230,10 @@ class ParamSpecListEditPanel extends PropertyEditor<List<Serializable>> {response.render(CssHeaderItem.forReference(new InputSpecCssResourceReference()));response.render(CssHeaderItem.forReference(new ParamSpecCssResourceReference()));}++ @Override+ public boolean needExplicitSubmit() {+ return true;+ }}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/supply/ParamListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/supply/ParamListEditPanel.javaindex 7a4245e1f1..75ac180bd0 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/supply/ParamListEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/supply/ParamListEditPanel.java@@ -448,5 +448,10 @@ class ParamListEditPanel extends PropertyEditor<List<Serializable>> {response.render(OnDomReadyHeaderItem.forScript(script));}}++ @Override+ public boolean needExplicitSubmit() {+ return true;+ }}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepListEditPanel.javaindex dce93fda6c..5fb54b9dfb 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepListEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepListEditPanel.java@@ -287,5 +287,10 @@ class StepListEditPanel extends PropertyEditor<List<Serializable>> {elsereturn null;}++ @Override+ public boolean needExplicitSubmit() {+ return true;+ }}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/choice/MultiChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/choice/MultiChoiceEditor.javaindex 692a79ce71..930ec1ea1c 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/choice/MultiChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/choice/MultiChoiceEditor.java@@ -116,4 +116,9 @@ public class MultiChoiceEditor extends PropertyEditor<List<String>> {return new ArrayList<>();}+ @Override+ public boolean needExplicitSubmit() {+ return true;+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/choice/SingleChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/choice/SingleChoiceEditor.javaindex 9d477ba81e..1333efa09b 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/choice/SingleChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/choice/SingleChoiceEditor.java@@ -106,4 +106,9 @@ public class SingleChoiceEditor extends PropertyEditor<String> {return input.getConvertedInput();}+ @Override+ public boolean needExplicitSubmit() {+ return false;+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/code/CodePropertyEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/code/CodePropertyEditor.javaindex 0333ed5994..2785e4875b 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/code/CodePropertyEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/code/CodePropertyEditor.java@@ -146,4 +146,9 @@ public class CodePropertyEditor extends PropertyEditor<List<String>> {response.render(OnLoadHeaderItem.forScript(script));}+ @Override+ public boolean needExplicitSubmit() {+ return true;+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/color/ColorPropertyEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/color/ColorPropertyEditor.javaindex 79bb7a650c..dfcb8bdb2a 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/color/ColorPropertyEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/color/ColorPropertyEditor.java@@ -50,4 +50,9 @@ public class ColorPropertyEditor extends PropertyEditor<String> {response.render(CssHeaderItem.forReference(new ColorSupportResourceReference()));}+ @Override+ public boolean needExplicitSubmit() {+ return true;+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/date/DatePropertyEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/date/DatePropertyEditor.javaindex 42387f1e02..cbbe0d750b 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/date/DatePropertyEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/date/DatePropertyEditor.java@@ -62,4 +62,9 @@ public class DatePropertyEditor extends PropertyEditor<Date> {return input.getConvertedInput();}+ @Override+ public boolean needExplicitSubmit() {+ return true;+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/editable.css b/server-core/src/main/java/io/onedev/server/web/editable/editable.cssindex 7fc68e45f4..b63622452b 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/editable.css+++ b/server-core/src/main/java/io/onedev/server/web/editable/editable.css@@ -116,4 +116,13 @@.property-editor.property-bean.property-defined + div + .form-text,.property-editor.property-polymorphic.property-defined + div + .form-text {display: none;-}\ No newline at end of file+}++.inplace-property-edit .switch {+ justify-content: center;+ padding-top: 8px;+}++.inplace-property-edit {+ width: 300px !important;+}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/emaillist/EmailListPropertyEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/emaillist/EmailListPropertyEditor.javaindex 4eb597a704..7e7aa469fc 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/emaillist/EmailListPropertyEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/emaillist/EmailListPropertyEditor.java@@ -66,4 +66,9 @@ public class EmailListPropertyEditor extends PropertyEditor<List<String>> {return values;}+ @Override+ public boolean needExplicitSubmit() {+ return true;+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/enumeration/EnumPropertyEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/enumeration/EnumPropertyEditor.javaindex 0604cb14db..5992bfd24f 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/enumeration/EnumPropertyEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/enumeration/EnumPropertyEditor.java@@ -90,4 +90,9 @@ public class EnumPropertyEditor extends PropertyEditor<Enum<?>> {return null;}+ @Override+ public boolean needExplicitSubmit() {+ return false;+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/enumlist/EnumListPropertyEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/enumlist/EnumListPropertyEditor.javaindex 0690e2dd1c..14e689e6ff 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/enumlist/EnumListPropertyEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/enumlist/EnumListPropertyEditor.java@@ -93,4 +93,9 @@ public class EnumListPropertyEditor extends PropertyEditor<List<Enum<?>>> {return values;}+ @Override+ public boolean needExplicitSubmit() {+ return true;+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupMultiChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupMultiChoiceEditor.javaindex 8d1e183522..0b3c70324b 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupMultiChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupMultiChoiceEditor.java@@ -94,4 +94,9 @@ public class GroupMultiChoiceEditor extends PropertyEditor<Collection<String>> {return groupNames;}+ @Override+ public boolean needExplicitSubmit() {+ return true;+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupSingleChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupSingleChoiceEditor.javaindex 68a29228cc..e73237ee00 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupSingleChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupSingleChoiceEditor.java@@ -90,4 +90,9 @@ public class GroupSingleChoiceEditor extends PropertyEditor<String> {return null;}+ @Override+ public boolean needExplicitSubmit() {+ return false;+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/issue/choice/IssueSingleChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/issue/choice/IssueSingleChoiceEditor.javaindex 451523b476..e0f85dbab5 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/issue/choice/IssueSingleChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/issue/choice/IssueSingleChoiceEditor.java@@ -15,7 +15,7 @@ import io.onedev.server.web.component.issue.choice.IssueChoiceProvider;import io.onedev.server.web.component.issue.choice.IssueSingleChoice;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;-import io.onedev.server.web.page.project.ProjectPage;+import io.onedev.server.web.util.ProjectAware;@SuppressWarnings("serial")public class IssueSingleChoiceEditor extends PropertyEditor<Long> {@@ -28,7 +28,11 @@ public class IssueSingleChoiceEditor extends PropertyEditor<Long> {}private Project getProject() {- return ((ProjectPage)getPage()).getProject();+ ProjectAware projectAware = findParent(ProjectAware.class);+ if (projectAware != null)+ return projectAware.getProject();+ else+ return null;}@Override@@ -83,4 +87,9 @@ public class IssueSingleChoiceEditor extends PropertyEditor<Long> {return null;}+ @Override+ public boolean needExplicitSubmit() {+ return false;+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/issue/fieldsupply/FieldListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/issue/fieldsupply/FieldListEditPanel.javaindex 0dd61d9650..66f60c2036 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/issue/fieldsupply/FieldListEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/issue/fieldsupply/FieldListEditPanel.java@@ -29,6 +29,7 @@ import com.google.common.base.Preconditions;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.support.administration.GlobalIssueSetting;+import io.onedev.server.model.support.issue.field.FieldUtils;import io.onedev.server.model.support.issue.field.spec.FieldSpec;import io.onedev.server.model.support.issue.field.spec.SecretField;import io.onedev.server.model.support.issue.field.supply.FieldSupply;@@ -36,7 +37,6 @@ import io.onedev.server.model.support.issue.field.supply.Ignore;import io.onedev.server.model.support.issue.field.supply.ScriptingValue;import io.onedev.server.model.support.issue.field.supply.SpecifiedValue;import io.onedev.server.model.support.issue.field.supply.ValueProvider;-import io.onedev.server.util.IssueUtils;import io.onedev.server.util.ReflectionUtils;import io.onedev.server.web.editable.BeanDescriptor;import io.onedev.server.web.editable.JobSecretEditBean;@@ -89,7 +89,7 @@ class FieldListEditPanel extends PropertyEditor<List<Serializable>> {private Serializable getDefaultFieldBean() {if (defaultFieldBean == null) {- Class<?> fieldBeanClass = IssueUtils.defineFieldBeanClass();+ Class<?> fieldBeanClass = FieldUtils.getFieldBeanClass();try {defaultFieldBean = (Serializable) fieldBeanClass.newInstance();} catch (InstantiationException | IllegalAccessException e) {@@ -299,5 +299,10 @@ class FieldListEditPanel extends PropertyEditor<List<Serializable>> {response.render(OnDomReadyHeaderItem.forScript(script));}}++ @Override+ public boolean needExplicitSubmit() {+ return true;+ }}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/jobprivilege/JobPrivilegeListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/jobprivilege/JobPrivilegeListEditPanel.javaindex ba07aee864..f4bfe84ed6 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/jobprivilege/JobPrivilegeListEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/jobprivilege/JobPrivilegeListEditPanel.java@@ -237,5 +237,10 @@ class JobPrivilegeListEditPanel extends PropertyEditor<List<Serializable>> {value.add(each);return value;}++ @Override+ public boolean needExplicitSubmit() {+ return true;+ }}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/markdown/MarkdownPropertyEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/markdown/MarkdownPropertyEditor.javaindex 861a85a8c9..667074c844 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/markdown/MarkdownPropertyEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/markdown/MarkdownPropertyEditor.java@@ -42,4 +42,9 @@ public class MarkdownPropertyEditor extends PropertyEditor<String> {return input.getConvertedInput();}+ @Override+ public boolean needExplicitSubmit() {+ return true;+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/milestonechoice/MilestoneSingleChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/milestonechoice/MilestoneSingleChoiceEditor.javaindex 12441bf2e9..b0f84fdb19 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/milestonechoice/MilestoneSingleChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/milestonechoice/MilestoneSingleChoiceEditor.java@@ -95,4 +95,9 @@ public class MilestoneSingleChoiceEditor extends PropertyEditor<String> {return null;}+ @Override+ public boolean needExplicitSubmit() {+ return false;+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/numeric/NumericPropertyEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/numeric/NumericPropertyEditor.javaindex 09965d7407..880069c91c 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/numeric/NumericPropertyEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/numeric/NumericPropertyEditor.java@@ -58,4 +58,9 @@ public class NumericPropertyEditor extends PropertyEditor<Number> {return input.getConvertedInput();}+ @Override+ public boolean needExplicitSubmit() {+ return true;+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/parentchoice/ParentChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/parentchoice/ParentChoiceEditor.javaindex 00d8d2efbc..94ac097965 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/parentchoice/ParentChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/parentchoice/ParentChoiceEditor.java@@ -64,4 +64,9 @@ public class ParentChoiceEditor extends PropertyEditor<String> {return input.getConvertedInput();}+ @Override+ public boolean needExplicitSubmit() {+ return false;+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/password/ConfirmativePasswordPropertyEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/password/ConfirmativePasswordPropertyEditor.javaindex bc87102b57..737d8f1534 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/password/ConfirmativePasswordPropertyEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/password/ConfirmativePasswordPropertyEditor.java@@ -80,4 +80,9 @@ public class ConfirmativePasswordPropertyEditor extends PropertyEditor<String> {}}+ @Override+ public boolean needExplicitSubmit() {+ return true;+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/password/PasswordPropertyEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/password/PasswordPropertyEditor.javaindex e9b8c32d6e..ea952e04a9 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/password/PasswordPropertyEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/password/PasswordPropertyEditor.java@@ -51,4 +51,9 @@ public class PasswordPropertyEditor extends PropertyEditor<String> {return input.getConvertedInput();}+ @Override+ public boolean needExplicitSubmit() {+ return true;+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicPropertyEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicPropertyEditor.javaindex a4f97e3686..feec21935e 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicPropertyEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicPropertyEditor.java@@ -271,4 +271,9 @@ public class PolymorphicPropertyEditor extends PropertyEditor<Serializable> {return null;}+ @Override+ public boolean needExplicitSubmit() {+ return false;+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/project/choice/ProjectMultiChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/project/choice/ProjectMultiChoiceEditor.javaindex 1d78bb922c..7d91513cf8 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/project/choice/ProjectMultiChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/project/choice/ProjectMultiChoiceEditor.java@@ -93,4 +93,9 @@ public class ProjectMultiChoiceEditor extends PropertyEditor<List<String>> {return projectPaths;}+ @Override+ public boolean needExplicitSubmit() {+ return true;+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/project/choice/ProjectSingleChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/project/choice/ProjectSingleChoiceEditor.javaindex 353bbb49e7..ca902765d4 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/project/choice/ProjectSingleChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/project/choice/ProjectSingleChoiceEditor.java@@ -80,4 +80,9 @@ public class ProjectSingleChoiceEditor extends PropertyEditor<String> {return null;}+ @Override+ public boolean needExplicitSubmit() {+ return false;+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/project/query/ProjectQueryEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/project/query/ProjectQueryEditor.javaindex 839200d1f1..aca6a8e37f 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/project/query/ProjectQueryEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/project/query/ProjectQueryEditor.java@@ -45,4 +45,9 @@ public class ProjectQueryEditor extends PropertyEditor<String> {return input.getConvertedInput();}+ @Override+ public boolean needExplicitSubmit() {+ return true;+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/pullrequest/choice/PullRequestSingleChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/pullrequest/choice/PullRequestSingleChoiceEditor.javaindex f762ac63d7..cdafa5f9d7 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/pullrequest/choice/PullRequestSingleChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/pullrequest/choice/PullRequestSingleChoiceEditor.java@@ -15,7 +15,7 @@ import io.onedev.server.web.component.pullrequest.choice.PullRequestChoiceProvidimport io.onedev.server.web.component.pullrequest.choice.PullRequestSingleChoice;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;-import io.onedev.server.web.page.project.ProjectPage;+import io.onedev.server.web.util.ProjectAware;@SuppressWarnings("serial")public class PullRequestSingleChoiceEditor extends PropertyEditor<Long> {@@ -28,7 +28,11 @@ public class PullRequestSingleChoiceEditor extends PropertyEditor<Long> {}private Project getProject() {- return ((ProjectPage)getPage()).getProject();+ ProjectAware projectAware = findParent(ProjectAware.class);+ if (projectAware != null)+ return projectAware.getProject();+ else+ return null;}@Override@@ -83,4 +87,9 @@ public class PullRequestSingleChoiceEditor extends PropertyEditor<Long> {return null;}+ @Override+ public boolean needExplicitSubmit() {+ return false;+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/revisionpick/RevisionPickEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/revisionpick/RevisionPickEditor.javaindex 72d13d397d..7bcef14f95 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/revisionpick/RevisionPickEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/revisionpick/RevisionPickEditor.java@@ -53,4 +53,9 @@ public class RevisionPickEditor extends PropertyEditor<String> {return revision;}+ @Override+ public boolean needExplicitSubmit() {+ return false;+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/rolechoice/RoleMultiChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/rolechoice/RoleMultiChoiceEditor.javaindex 7c3c09eecf..49540e40fa 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/rolechoice/RoleMultiChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/rolechoice/RoleMultiChoiceEditor.java@@ -78,4 +78,9 @@ public class RoleMultiChoiceEditor extends PropertyEditor<List<String>> {return new ArrayList<>();}+ @Override+ public boolean needExplicitSubmit() {+ return true;+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/rolechoice/RoleSingleChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/rolechoice/RoleSingleChoiceEditor.javaindex b32ca4cee7..a1d9a4c5d0 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/rolechoice/RoleSingleChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/rolechoice/RoleSingleChoiceEditor.java@@ -68,4 +68,9 @@ public class RoleSingleChoiceEditor extends PropertyEditor<String> {return input.getConvertedInput();}+ @Override+ public boolean needExplicitSubmit() {+ return false;+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/scriptchoice/ScriptChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/scriptchoice/ScriptChoiceEditor.javaindex da0b145eea..6b6e13d45d 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/scriptchoice/ScriptChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/scriptchoice/ScriptChoiceEditor.java@@ -86,4 +86,9 @@ public class ScriptChoiceEditor extends PropertyEditor<String> {return input.getConvertedInput();}+ @Override+ public boolean needExplicitSubmit() {+ return false;+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/servicedesk/IssueCreationSettingListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/servicedesk/IssueCreationSettingListEditPanel.javaindex c91ef2a1f4..6c2915b951 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/servicedesk/IssueCreationSettingListEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/servicedesk/IssueCreationSettingListEditPanel.java@@ -227,4 +227,9 @@ class IssueCreationSettingListEditPanel extends PropertyEditor<List<Serializablereturn value;}+ @Override+ public boolean needExplicitSubmit() {+ return true;+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/servicelocator/ServiceLocatorListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/servicelocator/ServiceLocatorListEditPanel.javaindex 4c73869edb..792a8ebf64 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/servicelocator/ServiceLocatorListEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/servicelocator/ServiceLocatorListEditPanel.java@@ -298,4 +298,9 @@ class ServiceLocatorListEditPanel extends PropertyEditor<List<Serializable>> {return value;}+ @Override+ public boolean needExplicitSubmit() {+ return true;+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/string/StringPropertyEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/string/StringPropertyEditor.javaindex c13ad8e238..2770438914 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/string/StringPropertyEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/string/StringPropertyEditor.java@@ -86,5 +86,10 @@ public class StringPropertyEditor extends PropertyEditor<String> {this.inputAssist = inputAssist;return this;}++ @Override+ public boolean needExplicitSubmit() {+ return true;+ }}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/userchoice/UserMultiChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/userchoice/UserMultiChoiceEditor.javaindex 1b721aec1b..909e07e09a 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/userchoice/UserMultiChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/userchoice/UserMultiChoiceEditor.java@@ -101,4 +101,9 @@ public class UserMultiChoiceEditor extends PropertyEditor<List<String>> {return new ArrayList<>();}+ @Override+ public boolean needExplicitSubmit() {+ return true;+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/userchoice/UserSingleChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/userchoice/UserSingleChoiceEditor.javaindex e9bb599c00..53b28a82e2 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/userchoice/UserSingleChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/userchoice/UserSingleChoiceEditor.java@@ -98,4 +98,9 @@ public class UserSingleChoiceEditor extends PropertyEditor<String> {return null;}+ @Override+ public boolean needExplicitSubmit() {+ return false;+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/workingperiod/WorkingPeriodPropertyEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/workingperiod/WorkingPeriodPropertyEditor.javaindex 9cec25059a..7fe41fc05a 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/workingperiod/WorkingPeriodPropertyEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/workingperiod/WorkingPeriodPropertyEditor.java@@ -74,4 +74,9 @@ public class WorkingPeriodPropertyEditor extends PropertyEditor<Integer> {}}+ @Override+ public boolean needExplicitSubmit() {+ return true;+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/page/base/base.css b/server-core/src/main/java/io/onedev/server/web/page/base/base.cssindex fc622b24f3..5d47b07097 100644--- a/server-core/src/main/java/io/onedev/server/web/page/base/base.css+++ b/server-core/src/main/java/io/onedev/server/web/page/base/base.css@@ -160,8 +160,10 @@ a.tree-junction {border-radius:0 0 0.42rem 0.42rem;}-.working-indicator {- color: var(--success);+.with-working-indicator+.working-indicator {+ margin-left: 0.4rem;+}+.working-indicator+.with-working-indicator {margin-left: 0.4rem;}diff --git a/server-core/src/main/java/io/onedev/server/web/page/base/base.js b/server-core/src/main/java/io/onedev/server/web/page/base/base.jsindex db335719d1..29cb25ee05 100644--- a/server-core/src/main/java/io/onedev/server/web/page/base/base.js+++ b/server-core/src/main/java/io/onedev/server/web/page/base/base.js@@ -287,10 +287,15 @@ onedev.server = {if ($this.closest(".no-autofocus").length == 0) {if ($this.hasClass("CodeMirror") && $this[0].CodeMirror.options.readOnly == false) {$this[0].CodeMirror.focus();- } else if ($this.closest(".select2-container").length == 0- && $this.attr("readonly") != "readonly"- && $this.attr("disabled") != "disabled") {- $this.focus();+ } else if ($this.attr("readonly") != "readonly" && $this.attr("disabled") != "disabled") {+ if ($this.closest(".select2-container").length != 0) {+ if ($this.closest(".inplace-property-edit").length != 0) {+ $this.focus();+ $this.closest(".select2-container").next("input").select2("open");+ }+ } else {+ $this.focus();+ }}return false;}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.htmlindex 009832c751..8664609c4a 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.html@@ -1,13 +1,11 @@<wicket:panel><div class="head d-flex flex-wrap align-items-center mb-2">- <wicket:enclosure child="state">- <div class="state mb-2 mr-2">- <span wicket:id="state"></span>- </div>- </wicket:enclosure>+ <div wicket:id="transit" class="state">+ <span wicket:id="state" class="mb-2 mr-2"></span>+ </div><div wicket:id="fields" class="field"></div>- <div class="avatars ml-auto">- <a wicket:id="avatars" class="avatar ml-2 mb-2"></a>+ <div class="avatars ml-auto d-flex flex-wrap mr-n2">+ <div wicket:id="avatars" class="avatar"></div></div></div><div class="body font-weight-bold d-flex flex-wrap">diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.javaindex 83180446a6..64cd7e0820 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.java@@ -9,6 +9,7 @@ import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.event.Broadcast;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.head.OnDomReadyHeaderItem;+import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.panel.GenericPanel;import org.apache.wicket.markup.repeater.RepeatingView;@@ -21,22 +22,24 @@ import org.hibernate.Hibernate;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.IssueManager;-import io.onedev.server.entitymanager.UserManager;+import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;-import io.onedev.server.model.User;+import io.onedev.server.model.support.issue.TransitionSpec;import io.onedev.server.model.support.issue.field.spec.FieldSpec;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.Input;import io.onedev.server.web.WebSession;+import io.onedev.server.web.ajaxlistener.AttachAjaxIndicatorListener;+import io.onedev.server.web.ajaxlistener.AttachAjaxIndicatorListener.AttachMode;import io.onedev.server.web.asset.emoji.Emojis;import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;import io.onedev.server.web.component.issue.IssueStateBadge;import io.onedev.server.web.component.issue.fieldvalues.FieldValuesPanel;+import io.onedev.server.web.component.issue.operation.TransitionMenuLink;import io.onedev.server.web.component.link.ActionablePageLink;import io.onedev.server.web.component.modal.ModalLink;import io.onedev.server.web.component.modal.ModalPanel;-import io.onedev.server.web.component.user.UserAvatar;import io.onedev.server.web.component.user.ident.Mode;import io.onedev.server.web.page.base.BasePage;import io.onedev.server.web.page.project.issues.detail.IssueActivitiesPage;@@ -63,22 +66,36 @@ abstract class BoardCardPanel extends GenericPanel<Issue> {super.onInitialize();List<String> displayFields = ((IssueBoardsPage)getPage()).getBoard().getDisplayFields();- add(new IssueStateBadge("state", new AbstractReadOnlyModel<Issue>() {++ WebMarkupContainer transitLink;+ List<TransitionSpec> transitionSpecs = OneDev.getInstance(SettingManager.class)+ .getIssueSetting().getTransitionSpecs();++ if (transitionSpecs.stream().anyMatch(it->it.canTransitManually(getIssue(), null))) {+ transitLink = new TransitionMenuLink("transit") {++ @Override+ protected Issue getIssue() {+ return BoardCardPanel.this.getIssue();+ }++ };+ transitLink.add(AttributeAppender.append("class", "transit"));+ } else {+ transitLink = new WebMarkupContainer("transit");+ }+ transitLink.setVisible(displayFields.contains(Issue.NAME_STATE));++ transitLink.add(new IssueStateBadge("state", new AbstractReadOnlyModel<Issue>() {@Overridepublic Issue getObject() {return getIssue();}- }) {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(displayFields.contains(Issue.NAME_STATE));- }-- });+ }));++ add(transitLink);RepeatingView fieldsView = new RepeatingView("fields");for (String fieldName: displayFields) {@@ -94,10 +111,19 @@ abstract class BoardCardPanel extends GenericPanel<Issue> {@Overrideprotected Input getField() {- return field;+ if (getIssue().isFieldVisible(fieldName))+ return field;+ else+ return null;+ }++ @SuppressWarnings("deprecation")+ @Override+ protected AttachAjaxIndicatorListener getInplaceEditAjaxIndicator() {+ return new AttachAjaxIndicatorListener(fieldsView.get(fieldsView.size()-1), AttachMode.APPEND, false);}- });+ }.setOutputMarkupId(true));}}}@@ -108,15 +134,28 @@ abstract class BoardCardPanel extends GenericPanel<Issue> {for (String fieldName: displayFields) {Input field = getIssue().getFieldInputs().get(fieldName);if (field != null && field.getType().equals(FieldSpec.USER) && !field.getValues().isEmpty()) {- for (String userName: field.getValues()) {- User user = OneDev.getInstance(UserManager.class).findByName(userName);- if (user != null) {- String tooltip = field.getName() + ": " + user.getDisplayName();- UserAvatar avatar = new UserAvatar(avatarsView.newChildId(), user);- avatar.add(AttributeAppender.append("title", tooltip));- avatarsView.add(avatar);+ avatarsView.add(new FieldValuesPanel(avatarsView.newChildId(), Mode.AVATAR) {++ @SuppressWarnings("deprecation")+ @Override+ protected AttachAjaxIndicatorListener getInplaceEditAjaxIndicator() {+ return new AttachAjaxIndicatorListener(avatarsView.get(0), AttachMode.PREPEND, false);}- }++ @Override+ protected Issue getIssue() {+ return BoardCardPanel.this.getIssue();+ }++ @Override+ protected Input getField() {+ if (getIssue().isFieldVisible(fieldName))+ return field;+ else+ return null;+ }++ }.setOutputMarkupId(true));}}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardCountLabel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardCountLabel.javaindex c44c9aade6..257530ca0b 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardCountLabel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardCountLabel.java@@ -1,15 +1,15 @@package io.onedev.server.web.page.project.issues.boards;import java.util.Collection;+import java.util.HashSet;+import java.util.Set;import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.model.LoadableDetachableModel;-import com.google.common.collect.Sets;-+import io.onedev.server.model.Issue;import io.onedev.server.model.Project;-import io.onedev.server.model.support.issue.BoardSpec;import io.onedev.server.web.behavior.WebSocketObserver;@SuppressWarnings("serial")@@ -41,7 +41,11 @@ abstract class CardCountLabel extends Label {@Overridepublic Collection<String> getObservables() {- return Sets.newHashSet(BoardSpec.getWebSocketObservable(getProject().getId()));+ Set<String> observables = new HashSet<>();+ observables.add(Issue.getListWebSocketObservable(getProject().getId()));+ for (Project project: getProject().getDescendants())+ observables.add(Issue.getListWebSocketObservable(project.getId()));+ return observables;}});diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardListPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardListPanel.javaindex c756a4582a..6146144175 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardListPanel.java@@ -2,7 +2,9 @@ package io.onedev.server.web.page.project.issues.boards;import java.util.ArrayList;import java.util.Collection;+import java.util.HashSet;import java.util.List;+import java.util.Set;import javax.annotation.Nullable;@@ -14,14 +16,11 @@ import org.apache.wicket.markup.repeater.RepeatingView;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;-import com.google.common.collect.Sets;-import io.onedev.commons.utils.ExplicitException;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.IssueManager;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;-import io.onedev.server.model.support.issue.BoardSpec;import io.onedev.server.search.entity.issue.IssueQuery;import io.onedev.server.web.WebConstants;import io.onedev.server.web.behavior.WebSocketObserver;@@ -139,7 +138,11 @@ abstract class CardListPanel extends Panel {@Overridepublic Collection<String> getObservables() {- return Sets.newHashSet(BoardSpec.getWebSocketObservable(getProject().getId()));+ Set<String> observables = new HashSet<>();+ observables.add(Issue.getListWebSocketObservable(getProject().getId()));+ for (Project project: getProject().getDescendants())+ observables.add(Issue.getListWebSocketObservable(project.getId()));+ return observables;}});diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/StateTransitionPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/StateTransitionPanel.javaindex 898a9236a5..0216dcf78a 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/StateTransitionPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/StateTransitionPanel.java@@ -1,6 +1,7 @@package io.onedev.server.web.page.project.issues.boards;import java.io.Serializable;+import java.util.Collection;import java.util.List;import java.util.Map;@@ -18,8 +19,8 @@ import io.onedev.server.model.Issue;import io.onedev.server.model.support.inputspec.InputContext;import io.onedev.server.model.support.inputspec.InputSpec;import io.onedev.server.model.support.issue.TransitionSpec;+import io.onedev.server.model.support.issue.field.FieldUtils;import io.onedev.server.model.support.issue.transitiontrigger.PressButtonTrigger;-import io.onedev.server.util.IssueUtils;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;@@ -34,7 +35,7 @@ abstract class StateTransitionPanel extends Panel implements InputContext {protected void onInitialize() {super.onInitialize();- Class<?> fieldBeanClass = IssueUtils.defineFieldBeanClass();+ Class<?> fieldBeanClass = FieldUtils.getFieldBeanClass();Serializable fieldBean = getIssue().getFieldBean(fieldBeanClass, true);Form<?> form = new Form<Void>("form");@@ -45,8 +46,9 @@ abstract class StateTransitionPanel extends Panel implements InputContext {PressButtonTrigger trigger = (PressButtonTrigger) getTransition().getTrigger();- BeanEditor editor = BeanContext.edit("editor", fieldBean,- IssueUtils.getPropertyNames(getIssue().getProject(), fieldBeanClass, trigger.getPromptFields()), false);+ Collection<String> propertyNames = FieldUtils.getEditablePropertyNames(+ getIssue().getProject(), fieldBeanClass, trigger.getPromptFields());+ BeanEditor editor = BeanContext.edit("editor", fieldBean, propertyNames, false);form.add(editor);form.add(new AjaxButton("ok") {@@ -55,8 +57,10 @@ abstract class StateTransitionPanel extends Panel implements InputContext {protected void onSubmit(AjaxRequestTarget target, Form<?> form) {super.onSubmit(target, form);- Map<String, Object> fieldValues = IssueUtils.getFieldValues(- editor.newComponentContext(), fieldBean, trigger.getPromptFields());+ Collection<String> editableFields = FieldUtils.getEditableFields(+ getIssue().getProject(), trigger.getPromptFields());+ Map<String, Object> fieldValues = FieldUtils.getFieldValues(+ editor.newComponentContext(), fieldBean, editableFields);OneDev.getInstance(IssueChangeManager.class).changeState(getIssue(),getTransition().getToState(), fieldValues, getTransition().getRemoveFields(), null);onSaved(target);diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/issue-boards.css b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/issue-boards.cssindex 6bd3205fc4..22d157a07b 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/issue-boards.css+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/issue-boards.css@@ -54,6 +54,16 @@box-shadow: 0px 0px 3px 1px rgba(0, 0, 0, 0.15);position: relative;}+.issue-boards>.body .board-card .state {+ border-bottom: 2px dotted transparent;+}+.issue-boards>.body .board-card .state.transit {+ cursor: pointer;+}+.issue-boards>.body .board-card .state.transit:hover {+ border-color: var(--gray);+}+.issue-boards>.body .board-card.issue-dragging {visibility: hidden;}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailCssResourceReference.javanew file mode 100644index 0000000000..dee4032322--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailCssResourceReference.java@@ -0,0 +1,13 @@+package io.onedev.server.web.page.project.issues.detail;++import io.onedev.server.web.page.base.BaseDependentCssResourceReference;++public class IssueDetailCssResourceReference extends BaseDependentCssResourceReference {++ private static final long serialVersionUID = 1L;++ public IssueDetailCssResourceReference() {+ super(IssueDetailCssResourceReference.class, "issue-detail.css");+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.javaindex 3686259d2a..5254da9ad6 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java@@ -11,6 +11,8 @@ import org.apache.wicket.Page;import org.apache.wicket.RestartResponseException;import org.apache.wicket.Session;import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.markup.head.CssHeaderItem;+import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.markup.html.link.Link;@@ -326,5 +328,11 @@ public abstract class IssueDetailPage extends ProjectIssuesPage implements Inputprotected String getPageTitle() {return getIssue().getTitle() + " - Issue #" + getIssue().getNumber() + " - " + getProject().getPath();}++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(CssHeaderItem.forReference(new IssueDetailCssResourceReference()));+ }}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/issue-detail.css b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/issue-detail.cssnew file mode 100644index 0000000000..f85fdb9ee7--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/issue-detail.css@@ -0,0 +1,18 @@+.issue-detail .transition-option .modal-header {+ display: none;+}+.issue-detail .transition-option .modal-body {+ padding: 0;+ display: block;+ flex: none;+}+.issue-detail .transition-option .modal-footer {+ display: block;+ padding: 0;+ border-top: none;+ margin-top: 1rem;+ border-radius: none;+}+.issue-detail .transition-option .modal-footer>* {+ margin-left: 0;+}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.html b/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.htmlindex 795b443f3a..b47194918b 100644--- a/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.html@@ -1,3 +1,2 @@<wicket:extend>- <a wicket:id="test">test</a></wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java b/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.javaindex c331d117bb..066be5dd6a 100644--- a/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java@@ -3,7 +3,6 @@ package io.onedev.server.web.page.test;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.head.JavaScriptHeaderItem;import org.apache.wicket.markup.head.OnDomReadyHeaderItem;-import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.web.page.base.BasePage;@@ -18,14 +17,6 @@ public class TestPage extends BasePage {@Overrideprotected void onInitialize() {super.onInitialize();-- add(new Link<Void>("test") {-- @Override- public void onClick() {- }-- });}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/websocket/IssueEventBroadcaster.java b/server-core/src/main/java/io/onedev/server/web/websocket/IssueEventBroadcaster.javaindex a67b1a5319..02de308c20 100644--- a/server-core/src/main/java/io/onedev/server/web/websocket/IssueEventBroadcaster.java+++ b/server-core/src/main/java/io/onedev/server/web/websocket/IssueEventBroadcaster.java@@ -7,7 +7,6 @@ import io.onedev.commons.loader.Listen;import io.onedev.server.event.issue.IssueEvent;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;-import io.onedev.server.model.support.issue.BoardSpec;@Singletonpublic class IssueEventBroadcaster {@@ -22,10 +21,10 @@ public class IssueEventBroadcaster {@Listenpublic void on(IssueEvent event) {webSocketManager.notifyObservableChange(Issue.getWebSocketObservable(event.getIssue().getId()));- if (event.affectsBoards()) {+ if (event.affectsListing()) {Project project = event.getIssue().getProject();do {- webSocketManager.notifyObservableChange(BoardSpec.getWebSocketObservable(project.getId()));+ webSocketManager.notifyObservableChange(Issue.getListWebSocketObservable(project.getId()));project = project.getParent();} while (project != null);}diff --git a/server-core/src/main/java/org/apache/wicket/application/AbstractClassResolver.java b/server-core/src/main/java/org/apache/wicket/application/AbstractClassResolver.javaindex d3e1ff4fbb..5c08583c4b 100644--- a/server-core/src/main/java/org/apache/wicket/application/AbstractClassResolver.java+++ b/server-core/src/main/java/org/apache/wicket/application/AbstractClassResolver.java@@ -30,7 +30,7 @@ import org.apache.wicket.WicketRuntimeException;import org.apache.wicket.util.collections.UrlExternalFormComparator;import io.onedev.server.buildspec.param.ParamUtils;-import io.onedev.server.util.IssueUtils;+import io.onedev.server.model.support.issue.field.FieldUtils;/*** An abstract implementation of a {@link IClassResolver} which uses a {@link ClassLoader} for@@ -59,12 +59,10 @@ public abstract class AbstractClassResolver implements IClassResolver@Overridepublic final Class<?> resolveClass(final String className) throws ClassNotFoundException{- Class<?> clazz = IssueUtils.loadFieldBeanClass(className);+ if (className.equals(FieldUtils.FIELD_BEAN_CLASS_NAME))+ return FieldUtils.getFieldBeanClass();- if (clazz != null)- return clazz;-- clazz = ParamUtils.loadBeanClass(className);+ Class<?> clazz = ParamUtils.loadBeanClass(className);if (clazz != null)return clazz;