The Unified and Autonomous Development Platform
Fix issue #440 - Prompt dependent fields when change issue fields by moving between board columns
Robin Shen415bf4b60d39
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 0408bc8aeb..d788d5e5be 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@@ -233,5 +233,5 @@ public class FieldUtils {};}-+}diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/PressButtonTrigger.java b/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/PressButtonTrigger.javaindex 6bcccb21ff..6fe865445a 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/PressButtonTrigger.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/PressButtonTrigger.java@@ -116,7 +116,7 @@ public class PressButtonTrigger extends TransitionTrigger {public boolean isAuthorized(Project project) {if (SecurityUtils.getUser() != null) {if (!getAuthorizedRoles().isEmpty()) {- if (SecurityUtils.canManageIssues(Project.get())) {+ if (SecurityUtils.canManageIssues(project)) {return true;} else {for (String roleName: getAuthorizedRoles()) {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 d5f7fe67cb..e978f8d54c 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@@ -42,7 +42,7 @@ public abstract class BeanEditModalPanel extends ModalPanel {@Overrideprotected void onSave(AjaxRequestTarget target, Serializable bean) {- BeanEditModalPanel.this.onSave(target, bean);+ BeanEditModalPanel.this.onSave(target, bean, propertyNames);}@Override@@ -74,7 +74,7 @@ public abstract class BeanEditModalPanel extends ModalPanel {};}- protected abstract void onSave(AjaxRequestTarget target, Serializable bean);+ protected abstract void onSave(AjaxRequestTarget target, Serializable bean, Collection<String> propertyNames);protected void onCancel(AjaxRequestTarget target) {}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 fe5f93a112..ab89c0d564 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@@ -135,7 +135,7 @@ public abstract class FieldValuesPanel extends Panel implements EditContext {}@Override- protected void onSave(AjaxRequestTarget target, Serializable bean) {+ protected void onSave(AjaxRequestTarget target, Serializable bean, Collection<String> propertyNames) {fieldValues.putAll(FieldUtils.getFieldValues(FieldUtils.newBeanComponentContext(beanDescriptor, bean),bean, FieldUtils.getEditableFields(getProject(), dependentFields)));diff --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.javaindex 1cb16edb9e..5fe68cad09 100644--- 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.java@@ -101,7 +101,7 @@ public abstract class InplacePropertyEditPanel<T> extends Panel implements EditC}- protected abstract void onUpdated(IPartialPageRequestHandler handler, Serializable bean, String propertyName);+ protected abstract void onUpdated(IPartialPageRequestHandler handler, Serializable bean, String z);protected abstract void onCancelled(IPartialPageRequestHandler handler);diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/jobexecutor/JobExecutorEditPanel.java b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/jobexecutor/JobExecutorEditPanel.javaindex 33f04a240e..993420de2e 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/jobexecutor/JobExecutorEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/jobexecutor/JobExecutorEditPanel.java@@ -3,6 +3,7 @@ package io.onedev.server.web.page.admin.buildsetting.jobexecutor;import java.io.Serializable;import java.lang.reflect.ParameterizedType;import java.lang.reflect.Type;+import java.util.Collection;import java.util.List;import javax.annotation.Nullable;@@ -174,7 +175,7 @@ abstract class JobExecutorEditPanel extends Panel {new BeanEditModalPanel(target, testData, Sets.newHashSet(), true, title) {@Override- protected void onSave(AjaxRequestTarget target, Serializable bean) {+ protected void onSave(AjaxRequestTarget target, Serializable bean, Collection<String> propertyNames) {close();target.add(editor);target.focusComponent(null);diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.javaindex 17f901b689..76c742f639 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java@@ -258,7 +258,7 @@ public abstract class BuildDetailPage extends ProjectPagenew BeanEditModalPanel(target, paramBean, secretParamNames, false, "Rebuild #" + build.getNumber()) {@Override- protected void onSave(AjaxRequestTarget target, Serializable bean) {+ protected void onSave(AjaxRequestTarget target, Serializable bean, Collection<String> propertyNames) {resubmit(paramBean);}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.javaindex 37e460cd33..9d2e54df32 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java@@ -1,6 +1,8 @@package io.onedev.server.web.page.project.issues.boards;+import java.io.Serializable;import java.util.ArrayList;+import java.util.Collection;import java.util.HashMap;import java.util.List;import java.util.Map;@@ -15,6 +17,7 @@ import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.attributes.CallbackParameter;import org.apache.wicket.behavior.AttributeAppender;+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;import org.apache.wicket.event.IEvent;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.head.OnDomReadyHeaderItem;@@ -40,10 +43,13 @@ import io.onedev.server.model.Milestone;import io.onedev.server.model.Project;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.choiceinput.choiceprovider.ChoiceProvider;import io.onedev.server.model.support.issue.BoardSpec;import io.onedev.server.model.support.issue.StateSpec;import io.onedev.server.model.support.issue.TransitionSpec;+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.model.support.issue.field.spec.UserChoiceField;@@ -59,11 +65,14 @@ import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.ComponentContext;import io.onedev.server.util.EditContext;import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;+import io.onedev.server.web.component.beaneditmodal.BeanEditModalPanel;import io.onedev.server.web.component.modal.ModalLink;import io.onedev.server.web.component.modal.ModalPanel;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.page.project.issues.list.ProjectIssueListPage;+import io.onedev.server.web.util.ProjectAware;@SuppressWarnings("serial")abstract class BoardColumnPanel extends Panel implements EditContext {@@ -102,7 +111,7 @@ abstract class BoardColumnPanel extends Panel implements EditContext {protected Integer load() {if (getQuery() != null) {try {- return OneDev.getInstance(IssueManager.class).count(getProject(), true, getQuery().getCriteria());+ return getIssueManager().count(getProject(), true, getQuery().getCriteria());} catch(ExplicitException e) {return 0;}@@ -334,7 +343,7 @@ abstract class BoardColumnPanel extends Panel implements EditContext {protected void respond(AjaxRequestTarget target) {IRequestParameters params = RequestCycle.get().getRequest().getPostParameters();Long issueId = params.getParameterValue("issue").toLong();- Issue issue = OneDev.getInstance(IssueManager.class).load(issueId);+ Issue issue = getIssueManager().load(issueId);String fieldName = getBoard().getIdentifyField();if (issue.getMilestone() == null && getMilestone() != null) {// move a backlog issue to board@@ -384,7 +393,7 @@ abstract class BoardColumnPanel extends Panel implements EditContext {@Overrideprotected Issue getIssue() {- return OneDev.getInstance(IssueManager.class).load(issueId);+ return getIssueManager().load(issueId);}@Override@@ -409,10 +418,65 @@ abstract class BoardColumnPanel extends Panel implements EditContext {if (!SecurityUtils.canEditIssueField(getProject(), fieldSpec.getName()))throw new UnauthorizedException("Permission denied");+ Serializable fieldBean = issue.getFieldBean(FieldUtils.getFieldBeanClass(), true);+ BeanDescriptor beanDescriptor = new BeanDescriptor(fieldBean.getClass());+ beanDescriptor.getProperty(fieldName).setPropertyValue(fieldBean, getColumn());++ Collection<String> dependentFields = fieldSpec.getTransitiveDependents();+ boolean hasVisibleEditableDependents = dependentFields.stream()+ .anyMatch(it->SecurityUtils.canEditIssueField(issue.getProject(), it)+ && FieldUtils.isFieldVisible(beanDescriptor, fieldBean, it));+Map<String, Object> fieldValues = new HashMap<>();fieldValues.put(fieldName, getColumn());- OneDev.getInstance(IssueChangeManager.class).changeFields(issue, fieldValues);- markAccepted(target, issue, true);++ if (hasVisibleEditableDependents) {+ Collection<String> propertyNames = FieldUtils.getEditablePropertyNames(+ issue.getProject(), fieldBean.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 BoardColumnPanel.this.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, Collection<String> propertyNames) {+ fieldValues.putAll(FieldUtils.getFieldValues(+ FieldUtils.newBeanComponentContext(beanDescriptor, bean),+ bean, FieldUtils.getEditableFields(getProject(), dependentFields)));+ close();+ Issue issue = getIssueManager().load(issueId);+ OneDev.getInstance(IssueChangeManager.class).changeFields(issue, fieldValues);+ markAccepted(target, issue, true);+ }++ @Override+ protected void onCancel(AjaxRequestTarget target) {+ markAccepted(target, getIssueManager().load(issueId), false);+ }++ }+ new DependentFieldsEditor(target, fieldBean, propertyNames, false, "Dependent Fields");+ } else {+ OneDev.getInstance(IssueChangeManager.class).changeFields(issue, fieldValues);+ markAccepted(target, issue, true);+ }}}@@ -421,6 +485,10 @@ abstract class BoardColumnPanel extends Panel implements EditContext {setOutputMarkupId(true);}+ private IssueManager getIssueManager() {+ return OneDev.getInstance(IssueManager.class);+ }+@Overridepublic Object getInputValue(String name) {return null;