The Unified and Autonomous Development Platform
fix issue #39: Multi-build issue field is displayed incorrectly
Robin Shenb74b11353041
diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/choice/build-choice.js b/server-core/src/main/java/io/onedev/server/web/component/build/choice/build-choice.jsindex 4e7b527611..91b58b9788 100644--- a/server-core/src/main/java/io/onedev/server/web/component/build/choice/build-choice.js+++ b/server-core/src/main/java/io/onedev/server/web/component/build/choice/build-choice.js@@ -1,14 +1,16 @@onedev.server.buildChoiceFormatter = {- formatSelection: function(build) {- return "#" + build.number;- },-- formatResult: function(build) {+ formatBuild: function(build) {if (build.version)return "<div class='build'>#" + build.number + " (" + build.version + ") : " + build.jobName + "</div>";elsereturn "<div class='build'>#" + build.number + " : " + build.jobName + "</div>";},+ formatSelection: function(build) {+ return onedev.server.buildChoiceFormatter.formatBuild(build);+ },+ formatResult: function(build) {+ return onedev.server.buildChoiceFormatter.formatBuild(build);+ },escapeMarkup: function(m) {return m;},diff --git a/server-core/src/main/java/io/onedev/server/web/editable/annotation/BuildChoice.java b/server-core/src/main/java/io/onedev/server/web/editable/annotation/BuildChoice.javaindex caaa95ab5f..bf74bc7684 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/annotation/BuildChoice.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/annotation/BuildChoice.java@@ -10,6 +10,5 @@ import java.lang.annotation.Target;public @interface BuildChoice {// optionally specify a method to return project for build query- String project() default "";}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 d715c66cd1..d33c7c3019 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@@ -5,8 +5,6 @@ import java.util.Collection;import java.util.List;import java.util.stream.Collectors;-import javax.annotation.Nullable;-import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;import org.apache.wicket.model.AbstractReadOnlyModel;@@ -14,20 +12,15 @@ import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;import org.apache.wicket.util.convert.ConversionException;-import com.google.common.base.Preconditions;-import io.onedev.server.OneDev;import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.model.Build;import io.onedev.server.model.Project;-import io.onedev.server.util.ComponentContext;-import io.onedev.server.util.ReflectionUtils;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.editable.annotation.BuildChoice;-import io.onedev.server.web.util.ProjectAware;+import io.onedev.server.web.page.project.ProjectPage;@SuppressWarnings("serial")public class BuildMultiChoiceEditor extends PropertyEditor<List<Long>> {@@ -39,21 +32,8 @@ public class BuildMultiChoiceEditor extends PropertyEditor<List<Long>> {super(id, propertyDescriptor, propertyModel);}- @Nullableprivate Project getProject() {- ComponentContext.push(new ComponentContext(this));- try {- BuildChoice choice = Preconditions.checkNotNull(descriptor- .getPropertyGetter().getAnnotation(BuildChoice.class));- if (choice.project().length() != 0) {- return (Project) ReflectionUtils.invokeStaticMethod(- descriptor.getBeanClass(), choice.project());- } else {- return findParent(ProjectAware.class).getProject();- }- } finally {- ComponentContext.pop();- }+ return ((ProjectPage)getPage()).getProject();}@Override@@ -63,8 +43,8 @@ public class BuildMultiChoiceEditor extends PropertyEditor<List<Long>> {List<Build> selections = new ArrayList<>();if (getModelObject() != null) {BuildManager buildManager = OneDev.getInstance(BuildManager.class);- for (Long buildId: getModelObject()) {- Build build = buildManager.get(buildId);+ for (Long buildNumber: getModelObject()) {+ Build build = buildManager.find(getProject(), buildNumber);if (build != null)selections.add(build);}@@ -107,7 +87,7 @@ public class BuildMultiChoiceEditor extends PropertyEditor<List<Long>> {protected List<Long> convertInputToValue() throws ConversionException {Collection<Build> builds = input.getConvertedInput();if (builds != null)- return builds.stream().map(it->it.getId()).collect(Collectors.toList());+ return builds.stream().map(it->it.getNumber()).collect(Collectors.toList());elsereturn new ArrayList<>();}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 6c447ba6ec..e5d04d2c18 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@@ -1,7 +1,5 @@package io.onedev.server.web.editable.build.choice;-import javax.annotation.Nullable;-import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;import org.apache.wicket.model.AbstractReadOnlyModel;@@ -9,20 +7,15 @@ import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;import org.apache.wicket.util.convert.ConversionException;-import com.google.common.base.Preconditions;-import io.onedev.server.OneDev;import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.model.Build;import io.onedev.server.model.Project;-import io.onedev.server.util.ComponentContext;-import io.onedev.server.util.ReflectionUtils;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.editable.annotation.BuildChoice;-import io.onedev.server.web.util.ProjectAware;+import io.onedev.server.web.page.project.ProjectPage;@SuppressWarnings("serial")public class BuildSingleChoiceEditor extends PropertyEditor<Long> {@@ -34,37 +27,16 @@ public class BuildSingleChoiceEditor extends PropertyEditor<Long> {super(id, propertyDescriptor, propertyModel);}- @Nullableprivate Project getProject() {- ComponentContext.push(new ComponentContext(this));- try {- BuildChoice choice = Preconditions.checkNotNull(descriptor- .getPropertyGetter().getAnnotation(BuildChoice.class));- if (choice.project().length() != 0) {- return (Project) ReflectionUtils.invokeStaticMethod(- descriptor.getBeanClass(), choice.project());- } else {- return findParent(ProjectAware.class).getProject();- }- } finally {- ComponentContext.pop();- }+ return ((ProjectPage)getPage()).getProject();}- @Nullable- private Build getBuild() {- if (getProject() != null && getModelObject() != null)- return OneDev.getInstance(BuildManager.class).find(getProject(), getModelObject());- else- return null;- }-@Overrideprotected void onInitialize() {super.onInitialize();Build build;- if (getProject() != null && getModelObject() != null)+ if (getModelObject() != null)build = OneDev.getInstance(BuildManager.class).find(getProject(), getModelObject());elsebuild = null;diff --git a/server-core/src/main/java/io/onedev/server/web/editable/issue/choice/IssueChoiceEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/issue/choice/IssueChoiceEditSupport.javaindex 3a93fd11ec..0b832f0c33 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/issue/choice/IssueChoiceEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/issue/choice/IssueChoiceEditSupport.java@@ -42,7 +42,7 @@ public class IssueChoiceEditSupport implements EditSupport {@Overridepublic PropertyEditor<Long> renderForEdit(String componentId, IModel<Long> model) {- return new IssueChoiceEditor(componentId, descriptor, model);+ return new IssueSingleChoiceEditor(componentId, descriptor, model);}};diff --git a/server-core/src/main/java/io/onedev/server/web/editable/issue/choice/IssueChoiceEditor.html b/server-core/src/main/java/io/onedev/server/web/editable/issue/choice/IssueSingleChoiceEditor.htmlsimilarity index 100%rename from server-core/src/main/java/io/onedev/server/web/editable/issue/choice/IssueChoiceEditor.htmlrename to server-core/src/main/java/io/onedev/server/web/editable/issue/choice/IssueSingleChoiceEditor.htmldiff --git a/server-core/src/main/java/io/onedev/server/web/editable/issue/choice/IssueChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/issue/choice/IssueSingleChoiceEditor.javasimilarity index 93%rename from server-core/src/main/java/io/onedev/server/web/editable/issue/choice/IssueChoiceEditor.javarename to server-core/src/main/java/io/onedev/server/web/editable/issue/choice/IssueSingleChoiceEditor.javaindex 0d0cb7f831..451523b476 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/issue/choice/IssueChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/issue/choice/IssueSingleChoiceEditor.java@@ -18,11 +18,11 @@ import io.onedev.server.web.editable.PropertyEditor;import io.onedev.server.web.page.project.ProjectPage;@SuppressWarnings("serial")-public class IssueChoiceEditor extends PropertyEditor<Long> {+public class IssueSingleChoiceEditor extends PropertyEditor<Long> {private IssueSingleChoice input;- public IssueChoiceEditor(String id, PropertyDescriptor propertyDescriptor,+ public IssueSingleChoiceEditor(String id, PropertyDescriptor propertyDescriptor,IModel<Long> propertyModel) {super(id, propertyDescriptor, propertyModel);}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/pullrequest/choice/PullRequestChoiceEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/pullrequest/choice/PullRequestChoiceEditSupport.javaindex ec7f7ac0cb..87d8b923b6 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/pullrequest/choice/PullRequestChoiceEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/pullrequest/choice/PullRequestChoiceEditSupport.java@@ -43,7 +43,7 @@ public class PullRequestChoiceEditSupport implements EditSupport {@Overridepublic PropertyEditor<Long> renderForEdit(String componentId, IModel<Long> model) {- return new PullRequestChoiceEditor(componentId, descriptor, model);+ return new PullRequestSingleChoiceEditor(componentId, descriptor, model);}};diff --git a/server-core/src/main/java/io/onedev/server/web/editable/pullrequest/choice/PullRequestChoiceEditor.html b/server-core/src/main/java/io/onedev/server/web/editable/pullrequest/choice/PullRequestSingleChoiceEditor.htmlsimilarity index 100%rename from server-core/src/main/java/io/onedev/server/web/editable/pullrequest/choice/PullRequestChoiceEditor.htmlrename to server-core/src/main/java/io/onedev/server/web/editable/pullrequest/choice/PullRequestSingleChoiceEditor.htmldiff --git a/server-core/src/main/java/io/onedev/server/web/editable/pullrequest/choice/PullRequestChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/pullrequest/choice/PullRequestSingleChoiceEditor.javasimilarity index 93%rename from server-core/src/main/java/io/onedev/server/web/editable/pullrequest/choice/PullRequestChoiceEditor.javarename to server-core/src/main/java/io/onedev/server/web/editable/pullrequest/choice/PullRequestSingleChoiceEditor.javaindex acbbf8b257..f762ac63d7 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/pullrequest/choice/PullRequestChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/pullrequest/choice/PullRequestSingleChoiceEditor.java@@ -18,11 +18,11 @@ import io.onedev.server.web.editable.PropertyEditor;import io.onedev.server.web.page.project.ProjectPage;@SuppressWarnings("serial")-public class PullRequestChoiceEditor extends PropertyEditor<Long> {+public class PullRequestSingleChoiceEditor extends PropertyEditor<Long> {private PullRequestSingleChoice input;- public PullRequestChoiceEditor(String id, PropertyDescriptor propertyDescriptor,+ public PullRequestSingleChoiceEditor(String id, PropertyDescriptor propertyDescriptor,IModel<Long> propertyModel) {super(id, propertyDescriptor, propertyModel);}