The Unified and Autonomous Development Platform
Draft version of build spec view and edit
Robin Shenf1a6bfdb8ea3
diff --git a/core/src/main/java/io/onedev/server/CoreModule.java b/core/src/main/java/io/onedev/server/CoreModule.javaindex f9838ae01d..d027330e21 100644--- a/core/src/main/java/io/onedev/server/CoreModule.java+++ b/core/src/main/java/io/onedev/server/CoreModule.java@@ -235,6 +235,7 @@ import io.onedev.server.web.editable.EditSupportRegistry;import io.onedev.server.web.page.layout.LayoutPage;import io.onedev.server.web.page.layout.MainNavContribution;import io.onedev.server.web.page.project.blob.render.BlobRendererContribution;+import io.onedev.server.web.page.project.blob.render.renderers.buildspec.BuildSpecRendererProvider;import io.onedev.server.web.util.avatar.AvatarManager;import io.onedev.server.web.util.avatar.DefaultAvatarManager;import io.onedev.server.web.util.markdown.CommitProcessor;@@ -414,6 +415,7 @@ public class CoreModule extends AbstractPluginModule {bind(WebSocketManager.class).to(DefaultWebSocketManager.class);contributeFromPackage(EditSupport.class, EditSupport.class);+ contributeFromPackage(EditSupport.class, BuildSpecRendererProvider.class);bind(WebApplication.class).to(OneWebApplication.class);bind(Application.class).to(OneWebApplication.class);diff --git a/core/src/main/java/io/onedev/server/build/DependencySpec.java b/core/src/main/java/io/onedev/server/build/DependencySpec.javaindex b29bd48759..0edb629a70 100644--- a/core/src/main/java/io/onedev/server/build/DependencySpec.java+++ b/core/src/main/java/io/onedev/server/build/DependencySpec.java@@ -10,8 +10,10 @@ public class DependencySpec implements Serializable {private static final long serialVersionUID = 1L;private String jobSpec;++ private String artifacts;- @Editable+ @Editable(name="Job", order=100)public String getJobSpec() {return jobSpec;}@@ -19,5 +21,14 @@ public class DependencySpec implements Serializable {public void setJobSpec(String jobSpec) {this.jobSpec = jobSpec;}++ @Editable(order=200)+ public String getArtifacts() {+ return artifacts;+ }++ public void setArtifacts(String artifacts) {+ this.artifacts = artifacts;+ }}diff --git a/core/src/main/java/io/onedev/server/build/JobSpec.java b/core/src/main/java/io/onedev/server/build/JobSpec.javaindex 3509341be0..086ad5afd7 100644--- a/core/src/main/java/io/onedev/server/build/JobSpec.java+++ b/core/src/main/java/io/onedev/server/build/JobSpec.java@@ -8,8 +8,10 @@ import org.hibernate.validator.constraints.NotEmpty;import io.onedev.server.util.inputspec.InputSpec;import io.onedev.server.web.editable.annotation.Editable;+import io.onedev.server.web.editable.annotation.Horizontal;@Editable+@Horizontalpublic class JobSpec implements Serializable {private static final long serialVersionUID = 1L;@@ -21,7 +23,7 @@ public class JobSpec implements Serializable {private List<InputSpec> params = new ArrayList<>();private List<StepSpec> steps = new ArrayList<>();-+@Editable(order=100)@NotEmptypublic String getName() {diff --git a/core/src/main/java/io/onedev/server/web/component/issue/statetransition/StateTransitionListPanel.java b/core/src/main/java/io/onedev/server/web/component/issue/statetransition/StateTransitionListPanel.javaindex a7acae7549..8c1b0f0465 100644--- a/core/src/main/java/io/onedev/server/web/component/issue/statetransition/StateTransitionListPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/issue/statetransition/StateTransitionListPanel.java@@ -127,6 +127,20 @@ public abstract class StateTransitionListPanel extends Panel {});+ columns.add(new AbstractColumn<TransitionSpec, Void>(Model.of("")) {++ @Override+ public void populateItem(Item<ICellPopulator<TransitionSpec>> cellItem, String componentId, IModel<TransitionSpec> rowModel) {+ cellItem.add(new Label(componentId, "<a title='Click the row for more info'><i class='fa fa-ellipsis-h'></i></a>").setEscapeModelStrings(false));+ }++ @Override+ public String getCssClass() {+ return "ellipsis";+ }++ });+IDataProvider<TransitionSpec> dataProvider = new ListDataProvider<TransitionSpec>() {@Overridediff --git a/core/src/main/java/io/onedev/server/web/editable/BeanEditor.html b/core/src/main/java/io/onedev/server/web/editable/BeanEditor.htmlindex bd90bad53a..53739fd6c0 100644--- a/core/src/main/java/io/onedev/server/web/editable/BeanEditor.html+++ b/core/src/main/java/io/onedev/server/web/editable/BeanEditor.html@@ -1,5 +1,5 @@<wicket:panel>- <div wicket:id="content" class="bean properties"></div>+ <div wicket:id="content" class="bean-properties"></div><wicket:fragment wicket:id="verticalFrag"><div wicket:id="properties" class="form-group">diff --git a/core/src/main/java/io/onedev/server/web/editable/BeanEditor.java b/core/src/main/java/io/onedev/server/web/editable/BeanEditor.javaindex c24b49413b..4f52b42d88 100644--- a/core/src/main/java/io/onedev/server/web/editable/BeanEditor.java+++ b/core/src/main/java/io/onedev/server/web/editable/BeanEditor.java@@ -301,7 +301,7 @@ public class BeanEditor extends ValueEditor<Serializable> {});- add(AttributeAppender.append("class", " bean editor editable"));+ add(AttributeAppender.append("class", "bean-editor editable"));setOutputMarkupId(true);}diff --git a/core/src/main/java/io/onedev/server/web/editable/BeanViewer.html b/core/src/main/java/io/onedev/server/web/editable/BeanViewer.htmlindex 18c6e261a3..780e591dcf 100644--- a/core/src/main/java/io/onedev/server/web/editable/BeanViewer.html+++ b/core/src/main/java/io/onedev/server/web/editable/BeanViewer.html@@ -1,5 +1,5 @@<wicket:panel>- <div class="bean properties">+ <div class="bean-properties"><table><tr wicket:id="properties"><td wicket:id="name" class="name"><span wicket:id="content"></span></td>diff --git a/core/src/main/java/io/onedev/server/web/editable/BeanViewer.java b/core/src/main/java/io/onedev/server/web/editable/BeanViewer.javaindex 410aa53c18..1d75bea3d5 100644--- a/core/src/main/java/io/onedev/server/web/editable/BeanViewer.java+++ b/core/src/main/java/io/onedev/server/web/editable/BeanViewer.java@@ -75,7 +75,7 @@ public class BeanViewer extends Panel implements EditContext {});- add(AttributeAppender.append("class", "bean viewer editable"));+ add(AttributeAppender.append("class", "bean-viewer editable"));}@Overridediff --git a/core/src/main/java/io/onedev/server/web/editable/DefaultEditSupportRegistry.java b/core/src/main/java/io/onedev/server/web/editable/DefaultEditSupportRegistry.javaindex 899c8bcadd..8fd8475c68 100644--- a/core/src/main/java/io/onedev/server/web/editable/DefaultEditSupportRegistry.java+++ b/core/src/main/java/io/onedev/server/web/editable/DefaultEditSupportRegistry.java@@ -2,12 +2,15 @@ package io.onedev.server.web.editable;import java.io.Serializable;import java.util.ArrayList;+import java.util.Comparator;import java.util.List;import java.util.Set;import javax.inject.Inject;import javax.inject.Singleton;+import edu.emory.mathcs.backport.java.util.Collections;+@Singletonpublic class DefaultEditSupportRegistry implements EditSupportRegistry {@@ -16,6 +19,14 @@ public class DefaultEditSupportRegistry implements EditSupportRegistry {@Injectpublic DefaultEditSupportRegistry(Set<EditSupport> editSupports) {this.editSupports = new ArrayList<EditSupport>(editSupports);+ Collections.sort(this.editSupports, new Comparator<EditSupport>() {++ @Override+ public int compare(EditSupport o1, EditSupport o2) {+ return o1.getPriority() - o2.getPriority();+ }++ });}@SuppressWarnings("unchecked")diff --git a/core/src/main/java/io/onedev/server/web/editable/EditSupport.java b/core/src/main/java/io/onedev/server/web/editable/EditSupport.javaindex 3340aa49c4..dcf46d3e7b 100644--- a/core/src/main/java/io/onedev/server/web/editable/EditSupport.java+++ b/core/src/main/java/io/onedev/server/web/editable/EditSupport.java@@ -7,6 +7,10 @@ import io.onedev.launcher.loader.ExtensionPoint;@ExtensionPointpublic interface EditSupport extends Serializable {+ int DEFAULT_PRIORITY = 100;+PropertyContext<?> getEditContext(PropertyDescriptor descriptor);+ int getPriority();+}diff --git a/core/src/main/java/io/onedev/server/web/editable/PropertyEditor.java b/core/src/main/java/io/onedev/server/web/editable/PropertyEditor.javaindex ec19413a7c..6152f7b682 100644--- a/core/src/main/java/io/onedev/server/web/editable/PropertyEditor.java+++ b/core/src/main/java/io/onedev/server/web/editable/PropertyEditor.java@@ -60,7 +60,7 @@ public abstract class PropertyEditor<T> extends ValueEditor<T> {@Overrideprotected String load() {- String classes = " property editor editable ";+ String classes = " property-editor editable ";if (hasErrors(true) && getErrorClass() != null)classes += getErrorClass();return classes;diff --git a/core/src/main/java/io/onedev/server/web/editable/PropertyViewer.java b/core/src/main/java/io/onedev/server/web/editable/PropertyViewer.javaindex 3c11a25af1..425202d1c3 100644--- a/core/src/main/java/io/onedev/server/web/editable/PropertyViewer.java+++ b/core/src/main/java/io/onedev/server/web/editable/PropertyViewer.java@@ -20,7 +20,7 @@ public abstract class PropertyViewer extends Panel {super.onInitialize();add(newContent("content", descriptor));- add(AttributeAppender.append("class", "property viewer editable"));+ add(AttributeAppender.append("class", "property-viewer editable"));}protected abstract Component newContent(String id, PropertyDescriptor descriptor);diff --git a/core/src/main/java/io/onedev/server/web/editable/bean/BeanEditSupport.java b/core/src/main/java/io/onedev/server/web/editable/bean/BeanEditSupport.javaindex 51da38032c..f0b422171a 100644--- a/core/src/main/java/io/onedev/server/web/editable/bean/BeanEditSupport.java+++ b/core/src/main/java/io/onedev/server/web/editable/bean/BeanEditSupport.java@@ -51,4 +51,9 @@ public class BeanEditSupport implements EditSupport {}}+ @Override+ public int getPriority() {+ return DEFAULT_PRIORITY;+ }+}diff --git a/core/src/main/java/io/onedev/server/web/editable/bean/BeanPropertyEditor.html b/core/src/main/java/io/onedev/server/web/editable/bean/BeanPropertyEditor.htmlindex a5baed9441..bc63b94436 100644--- a/core/src/main/java/io/onedev/server/web/editable/bean/BeanPropertyEditor.html+++ b/core/src/main/java/io/onedev/server/web/editable/bean/BeanPropertyEditor.html@@ -1,6 +1,6 @@<wicket:panel><wicket:enclosure child:id="enable">- <input wicket:id="enable" type="checkbox" class="enable"></input>+ <input wicket:id="enable" type="checkbox" class="enable"></wicket:enclosure><div wicket:id="beanEditor"></div></wicket:panel>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListEditSupport.java b/core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListEditSupport.javaindex 0281aa5d72..6dffd5720e 100644--- a/core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListEditSupport.java+++ b/core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListEditSupport.java@@ -54,4 +54,9 @@ public class BeanListEditSupport implements EditSupport {return null;}+ @Override+ public int getPriority() {+ return DEFAULT_PRIORITY;+ }+}diff --git a/core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.html b/core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.htmlindex a609183143..2e0dd2df8e 100644--- a/core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.html+++ b/core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.html@@ -1,29 +1,32 @@<wicket:panel>- <table wicket:id="listEditor" class="bean list">- <thead>- <th wicket:id="headers">- <span wicket:id="header"></span>- <span wicket:id="required" class="required"></span>- <span wicket:id="help" class="fa fa-question-circle"></span>- </th>- <th class="actions"> </th>- </thead>- <tbody>- <tr wicket:id="elements">- <td wicket:id="properties">- <div wicket:id="propertyEditor"></div>- <div wicket:id="feedback"></div>- </td>- <td class="actions">- <a wicket:id="deleteElement" title="Delete this element"><span class="fa fa-trash delete"></span></a>- <span class="drag-indicator fa fa-reorder"></span>- </td>- </tr>- </tbody>- <tfoot>- <tr class="add-element">- <td wicket:id="newRow" class="add-element"><a wicket:id="addElement" class="btn btn-default"><span class="fa fa-plus-circle add"></span> <span wicket:id="label"></span></a></td>- </tr>- </tfoot>- </table>+ <div class="bean-list list">+ <div class="head"><a wicket:id="addElement" title="Add new" class="add-element btn btn-default btn-xs"><i class="fa fa-plus"></i></a></div>+ <table class="table table-condensed">+ <thead>+ <th wicket:id="headers">+ <span wicket:id="header"></span>+ <span wicket:id="required" class="required"></span>+ <span wicket:id="help" class="fa fa-question-circle"></span>+ </th>+ <th class="actions"> </th>+ </thead>+ <tbody>+ <tr wicket:id="elements">+ <td wicket:id="properties">+ <div wicket:id="propertyEditor"></div>+ <div wicket:id="feedback"></div>+ </td>+ <td class="actions">+ <a wicket:id="deleteElement" title="Delete this"><span class="fa fa-trash delete"></span></a>+ <span class="drag-indicator fa fa-reorder"></span>+ </td>+ </tr>+ </tbody>+ <tfoot wicket:id="noElements">+ <tr>+ <td wicket:id="td" class="no-elements">No elements defined</td>+ </tr>+ </tfoot>+ </table>+ </div></wicket:panel>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.java b/core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.javaindex f6eb42fa26..72be75b714 100644--- a/core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.java+++ b/core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.java@@ -7,7 +7,6 @@ import java.util.ArrayList;import java.util.Iterator;import java.util.List;-import org.apache.wicket.AttributeModifier;import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.markup.html.form.AjaxButton;@@ -45,6 +44,10 @@ public class BeanListPropertyEditor extends PropertyEditor<List<Serializable>> {private final Class<?> elementClass;+ private RepeatingView rows;++ private WebMarkupContainer noElements;+public BeanListPropertyEditor(String id, PropertyDescriptor propertyDescriptor, IModel<List<Serializable>> model) {super(id, propertyDescriptor, model);@@ -84,32 +87,10 @@ public class BeanListPropertyEditor extends PropertyEditor<List<Serializable>> {super.onInitialize();List<Serializable> list = getModelObject();- if (list == null && getDescriptor().isPropertyRequired())+ if (list == null)list = newList();- add(newListEditor(list));- }-- @Override- protected String getErrorClass() {- return null;- }-- @Override- public void onEvent(IEvent<?> event) {- super.onEvent(event);-- if (event.getPayload() instanceof PropertyUpdating) {- event.stop();- onPropertyUpdating(((PropertyUpdating)event.getPayload()).getHandler());- }- }-- private Component newListEditor(List<Serializable> list) {- WebMarkupContainer listEditor = new WebMarkupContainer("listEditor");-- listEditor.setOutputMarkupPlaceholderTag(true);- listEditor.add(new ListView<PropertyContext<Serializable>>("headers", propertyContexts) {+ add(new ListView<PropertyContext<Serializable>>("headers", propertyContexts) {@Overrideprotected void populateItem(ListItem<PropertyContext<Serializable>> item) {@@ -136,26 +117,14 @@ public class BeanListPropertyEditor extends PropertyEditor<List<Serializable>> {});- RepeatingView rows = new RepeatingView("elements");- listEditor.add(rows);+ rows = new RepeatingView("elements");+ add(rows);- if (list != null) {- for (Serializable element: list) {- addRow(rows, element);- }- } else {- listEditor.setVisible(false);+ for (Serializable element: list) {+ addRow(element);}- WebMarkupContainer newRow = new WebMarkupContainer("newRow");- newRow.add(AttributeModifier.append("colspan", propertyContexts.size() + 1));- newRow.add(new AjaxButton("addElement") {-- @Override- protected void onInitialize() {- super.onInitialize();- add(new Label("label", "Add " + EditableUtils.getDisplayName(elementClass)));- }+ add(new AjaxButton("addElement") {@SuppressWarnings("deprecation")@Override@@ -168,24 +137,40 @@ public class BeanListPropertyEditor extends PropertyEditor<List<Serializable>> {elselastRow = null;- Component newRow = addRow(rows, newElement());+ Component newRow = addRow(newElement());String script = String.format("$('<tr id=\"%s\"></tr>')", newRow.getMarkupId());if (lastRow != null)script += ".insertAfter('#" + lastRow.getMarkupId() + "');";else- script += ".appendTo('#" + listEditor.getMarkupId() + ">tbody');";+ script += ".appendTo('#" + BeanListPropertyEditor.this.getMarkupId() + ">div>table>tbody');";target.prependJavaScript(script);target.add(newRow);-+ target.add(noElements);+onPropertyUpdating(target);}}.setDefaultFormProcessing(false));- listEditor.add(newRow);+ add(noElements = new WebMarkupContainer("noElements") {++ @Override+ protected void onInitialize() {+ super.onInitialize();+ add(new WebMarkupContainer("td").add(AttributeAppender.append("colspan", propertyContexts.size())));+ setOutputMarkupPlaceholderTag(true);+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(rows.size() == 0);+ }++ });- listEditor.add(new SortBehavior() {+ add(new SortBehavior() {@SuppressWarnings("deprecation")@Override@@ -217,12 +202,27 @@ public class BeanListPropertyEditor extends PropertyEditor<List<Serializable>> {onPropertyUpdating(target);}- }.sortable("tbody"));+ }.sortable("tbody"));++ setOutputMarkupId(true);+ }- return listEditor;+ @Override+ protected String getErrorClass() {+ return null;}- private WebMarkupContainer addRow(RepeatingView rows, Serializable element) {+ @Override+ public void onEvent(IEvent<?> event) {+ super.onEvent(event);++ if (event.getPayload() instanceof PropertyUpdating) {+ event.stop();+ onPropertyUpdating(((PropertyUpdating)event.getPayload()).getHandler());+ }+ }++ private WebMarkupContainer addRow(Serializable element) {WebMarkupContainer row = new WebMarkupContainer(rows.newChildId());row.setOutputMarkupId(true);rows.add(row);@@ -256,6 +256,7 @@ public class BeanListPropertyEditor extends PropertyEditor<List<Serializable>> {target.appendJavaScript($(row).chain("remove").get());target.appendJavaScript(String.format("onedev.server.form.markDirty($('#%s'));", form.getMarkupId(true)));rows.remove(row);+ target.add(noElements);onPropertyUpdating(target);}@@ -266,9 +267,6 @@ public class BeanListPropertyEditor extends PropertyEditor<List<Serializable>> {@SuppressWarnings("unchecked")private List<PropertyEditor<Serializable>> getPropertyEditorsAtRow(int index) {- WebMarkupContainer table = (WebMarkupContainer) get("listEditor");- RepeatingView rows = (RepeatingView) table.get("elements");-int currentIndex = 0;Iterator<Component> it = rows.iterator();Component row = it.next();@@ -332,7 +330,6 @@ public class BeanListPropertyEditor extends PropertyEditor<List<Serializable>> {protected List<Serializable> convertInputToValue() throws ConversionException {List<Serializable> newList = newList();- RepeatingView rows = (RepeatingView) get("listEditor").get("elements");for (Component row: rows) {Serializable element = newElement();newList.add(element);diff --git a/core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyViewer.html b/core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyViewer.htmlindex 8e43ba9c52..f217232e70 100644--- a/core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyViewer.html+++ b/core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyViewer.html@@ -1,23 +1,23 @@<wicket:panel>- <div class="property viewer">- <table class="bean list table table-condensed">- <thead>- <th wicket:id="headers">- <span wicket:id="header"></span>- </th>- </thead>- <tbody>- <tr wicket:id="rows">- <td wicket:id="columns">- <div wicket:id="cell"></div>- </td>- </tr>- <wicket:enclosure>- <tr class="no-elements">- <td wicket:id="noElements">No elements defined</td>- </tr>- </wicket:enclosure>- </tbody>- </table>- </div>+ <table class="bean-list table table-condensed">+ <thead>+ <th wicket:id="headers">+ <span wicket:id="header"></span>+ </th>+ </thead>+ <tbody>+ <tr wicket:id="rows">+ <td wicket:id="columns">+ <div wicket:id="cell"></div>+ </td>+ </tr>+ </tbody>+ <wicket:enclosure child="noElements">+ <tfoot>+ <tr>+ <td wicket:id="noElements" class="no-elements">No elements defined</td>+ </tr>+ </tfoot>+ </wicket:enclosure>+ </table></wicket:panel>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/editable/bool/BooleanEditSupport.java b/core/src/main/java/io/onedev/server/web/editable/bool/BooleanEditSupport.javaindex 119c3086a1..e7bc370ad4 100644--- a/core/src/main/java/io/onedev/server/web/editable/bool/BooleanEditSupport.java+++ b/core/src/main/java/io/onedev/server/web/editable/bool/BooleanEditSupport.java@@ -60,4 +60,9 @@ public class BooleanEditSupport implements EditSupport {}}+ @Override+ public int getPriority() {+ return DEFAULT_PRIORITY;+ }+}diff --git a/core/src/main/java/io/onedev/server/web/editable/branchchoice/BranchEditSupport.java b/core/src/main/java/io/onedev/server/web/editable/branchchoice/BranchEditSupport.javaindex ad6a6162d7..048241c493 100644--- a/core/src/main/java/io/onedev/server/web/editable/branchchoice/BranchEditSupport.java+++ b/core/src/main/java/io/onedev/server/web/editable/branchchoice/BranchEditSupport.java@@ -91,4 +91,9 @@ public class BranchEditSupport implements EditSupport {}}+ @Override+ public int getPriority() {+ return DEFAULT_PRIORITY;+ }+}diff --git a/core/src/main/java/io/onedev/server/web/editable/branchpattern/BranchPatternEditSupport.java b/core/src/main/java/io/onedev/server/web/editable/branchpattern/BranchPatternEditSupport.javaindex 9e70b21691..0722e405f0 100644--- a/core/src/main/java/io/onedev/server/web/editable/branchpattern/BranchPatternEditSupport.java+++ b/core/src/main/java/io/onedev/server/web/editable/branchpattern/BranchPatternEditSupport.java@@ -60,4 +60,9 @@ public class BranchPatternEditSupport implements EditSupport {}}+ @Override+ public int getPriority() {+ return DEFAULT_PRIORITY;+ }+}diff --git a/core/src/main/java/io/onedev/server/web/editable/buildchoice/BuildEditSupport.java b/core/src/main/java/io/onedev/server/web/editable/buildchoice/BuildEditSupport.javaindex 757e03b4d9..d3f5ae3878 100644--- a/core/src/main/java/io/onedev/server/web/editable/buildchoice/BuildEditSupport.java+++ b/core/src/main/java/io/onedev/server/web/editable/buildchoice/BuildEditSupport.java@@ -57,4 +57,9 @@ public class BuildEditSupport implements EditSupport {}}+ @Override+ public int getPriority() {+ return DEFAULT_PRIORITY;+ }+}diff --git a/core/src/main/java/io/onedev/server/web/editable/buildquery/BuildQueryEditSupport.java b/core/src/main/java/io/onedev/server/web/editable/buildquery/BuildQueryEditSupport.javaindex 089054d132..f90683ffa6 100644--- a/core/src/main/java/io/onedev/server/web/editable/buildquery/BuildQueryEditSupport.java+++ b/core/src/main/java/io/onedev/server/web/editable/buildquery/BuildQueryEditSupport.java@@ -55,4 +55,9 @@ public class BuildQueryEditSupport implements EditSupport {}}+ @Override+ public int getPriority() {+ return DEFAULT_PRIORITY;+ }+}diff --git a/core/src/main/java/io/onedev/server/web/editable/choice/ChoiceEditSupport.java b/core/src/main/java/io/onedev/server/web/editable/choice/ChoiceEditSupport.javaindex 04a60ceaea..b26965fcdc 100644--- a/core/src/main/java/io/onedev/server/web/editable/choice/ChoiceEditSupport.java+++ b/core/src/main/java/io/onedev/server/web/editable/choice/ChoiceEditSupport.java@@ -89,4 +89,9 @@ public class ChoiceEditSupport implements EditSupport {}+ @Override+ public int getPriority() {+ return DEFAULT_PRIORITY;+ }+}diff --git a/core/src/main/java/io/onedev/server/web/editable/codecommentquery/CodeCommentQueryEditSupport.java b/core/src/main/java/io/onedev/server/web/editable/codecommentquery/CodeCommentQueryEditSupport.javaindex 43049fbd10..ec6c3b2287 100644--- a/core/src/main/java/io/onedev/server/web/editable/codecommentquery/CodeCommentQueryEditSupport.java+++ b/core/src/main/java/io/onedev/server/web/editable/codecommentquery/CodeCommentQueryEditSupport.java@@ -55,4 +55,9 @@ public class CodeCommentQueryEditSupport implements EditSupport {}}+ @Override+ public int getPriority() {+ return DEFAULT_PRIORITY;+ }+}diff --git a/core/src/main/java/io/onedev/server/web/editable/color/ColorEditSupport.java b/core/src/main/java/io/onedev/server/web/editable/color/ColorEditSupport.javaindex 24967c54df..4f944575b3 100644--- a/core/src/main/java/io/onedev/server/web/editable/color/ColorEditSupport.java+++ b/core/src/main/java/io/onedev/server/web/editable/color/ColorEditSupport.java@@ -49,4 +49,9 @@ public class ColorEditSupport implements EditSupport {}+ @Override+ public int getPriority() {+ return DEFAULT_PRIORITY;+ }+}diff --git a/core/src/main/java/io/onedev/server/web/editable/commitquery/CommitQueryEditSupport.java b/core/src/main/java/io/onedev/server/web/editable/commitquery/CommitQueryEditSupport.javaindex f8bac9e8dc..54a94c6fe0 100644--- a/core/src/main/java/io/onedev/server/web/editable/commitquery/CommitQueryEditSupport.java+++ b/core/src/main/java/io/onedev/server/web/editable/commitquery/CommitQueryEditSupport.java@@ -55,4 +55,9 @@ public class CommitQueryEditSupport implements EditSupport {}}+ @Override+ public int getPriority() {+ return DEFAULT_PRIORITY;+ }+}diff --git a/core/src/main/java/io/onedev/server/web/editable/configuration/ConfigurationEditSupport.java b/core/src/main/java/io/onedev/server/web/editable/configuration/ConfigurationEditSupport.javaindex 097c4ec067..7d950cadba 100644--- a/core/src/main/java/io/onedev/server/web/editable/configuration/ConfigurationEditSupport.java+++ b/core/src/main/java/io/onedev/server/web/editable/configuration/ConfigurationEditSupport.java@@ -87,4 +87,9 @@ public class ConfigurationEditSupport implements EditSupport {}}+ @Override+ public int getPriority() {+ return DEFAULT_PRIORITY;+ }+}diff --git a/core/src/main/java/io/onedev/server/web/editable/date/DateEditSupport.java b/core/src/main/java/io/onedev/server/web/editable/date/DateEditSupport.javaindex 8b649bd2a2..e04f7486dd 100644--- a/core/src/main/java/io/onedev/server/web/editable/date/DateEditSupport.java+++ b/core/src/main/java/io/onedev/server/web/editable/date/DateEditSupport.java@@ -57,4 +57,9 @@ public class DateEditSupport implements EditSupport {}+ @Override+ public int getPriority() {+ return DEFAULT_PRIORITY;+ }+}diff --git a/core/src/main/java/io/onedev/server/web/editable/enumeration/EnumEditSupport.java b/core/src/main/java/io/onedev/server/web/editable/enumeration/EnumEditSupport.javaindex bd18e4ec30..358398012c 100644--- a/core/src/main/java/io/onedev/server/web/editable/enumeration/EnumEditSupport.java+++ b/core/src/main/java/io/onedev/server/web/editable/enumeration/EnumEditSupport.java@@ -46,4 +46,9 @@ public class EnumEditSupport implements EditSupport {}}+ @Override+ public int getPriority() {+ return DEFAULT_PRIORITY;+ }+}diff --git a/core/src/main/java/io/onedev/server/web/editable/enumlist/EnumListEditSupport.java b/core/src/main/java/io/onedev/server/web/editable/enumlist/EnumListEditSupport.javaindex c5bd8aed68..af48d3391f 100644--- a/core/src/main/java/io/onedev/server/web/editable/enumlist/EnumListEditSupport.java+++ b/core/src/main/java/io/onedev/server/web/editable/enumlist/EnumListEditSupport.java@@ -59,4 +59,9 @@ public class EnumListEditSupport implements EditSupport {return null;}+ @Override+ public int getPriority() {+ return DEFAULT_PRIORITY;+ }+}diff --git a/core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupEditSupport.java b/core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupEditSupport.javaindex 3dcc691ccd..611611fc0b 100644--- a/core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupEditSupport.java+++ b/core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupEditSupport.java@@ -85,4 +85,9 @@ public class GroupEditSupport implements EditSupport {}}+ @Override+ public int getPriority() {+ return DEFAULT_PRIORITY;+ }+}diff --git a/core/src/main/java/io/onedev/server/web/editable/issuechoice/IssueEditSupport.java b/core/src/main/java/io/onedev/server/web/editable/issuechoice/IssueEditSupport.javaindex 33007e51b9..9721d38e12 100644--- a/core/src/main/java/io/onedev/server/web/editable/issuechoice/IssueEditSupport.java+++ b/core/src/main/java/io/onedev/server/web/editable/issuechoice/IssueEditSupport.java@@ -55,4 +55,9 @@ public class IssueEditSupport implements EditSupport {}}+ @Override+ public int getPriority() {+ return DEFAULT_PRIORITY;+ }+}diff --git a/core/src/main/java/io/onedev/server/web/editable/issuequery/IssueQueryEditSupport.java b/core/src/main/java/io/onedev/server/web/editable/issuequery/IssueQueryEditSupport.javaindex 134c5eee66..f14b0a331d 100644--- a/core/src/main/java/io/onedev/server/web/editable/issuequery/IssueQueryEditSupport.java+++ b/core/src/main/java/io/onedev/server/web/editable/issuequery/IssueQueryEditSupport.java@@ -55,4 +55,9 @@ public class IssueQueryEditSupport implements EditSupport {}}+ @Override+ public int getPriority() {+ return DEFAULT_PRIORITY;+ }+}diff --git a/core/src/main/java/io/onedev/server/web/editable/markdown/MarkdownEditSupport.java b/core/src/main/java/io/onedev/server/web/editable/markdown/MarkdownEditSupport.javaindex 35fc724159..43d664af5d 100644--- a/core/src/main/java/io/onedev/server/web/editable/markdown/MarkdownEditSupport.java+++ b/core/src/main/java/io/onedev/server/web/editable/markdown/MarkdownEditSupport.java@@ -46,4 +46,9 @@ public class MarkdownEditSupport implements EditSupport {}+ @Override+ public int getPriority() {+ return DEFAULT_PRIORITY;+ }+}diff --git a/core/src/main/java/io/onedev/server/web/editable/numeric/NumericEditSupport.java b/core/src/main/java/io/onedev/server/web/editable/numeric/NumericEditSupport.javaindex 04f0754134..295f7f83f4 100644--- a/core/src/main/java/io/onedev/server/web/editable/numeric/NumericEditSupport.java+++ b/core/src/main/java/io/onedev/server/web/editable/numeric/NumericEditSupport.java@@ -58,4 +58,9 @@ public class NumericEditSupport implements EditSupport {}+ @Override+ public int getPriority() {+ return DEFAULT_PRIORITY;+ }+}diff --git a/core/src/main/java/io/onedev/server/web/editable/password/PasswordEditSupport.java b/core/src/main/java/io/onedev/server/web/editable/password/PasswordEditSupport.javaindex dce7957e53..8c1861f700 100644--- a/core/src/main/java/io/onedev/server/web/editable/password/PasswordEditSupport.java+++ b/core/src/main/java/io/onedev/server/web/editable/password/PasswordEditSupport.java@@ -79,4 +79,9 @@ public class PasswordEditSupport implements EditSupport {}}+ @Override+ public int getPriority() {+ return DEFAULT_PRIORITY;+ }+}diff --git a/core/src/main/java/io/onedev/server/web/editable/pathpattern/PathPatternEditSupport.java b/core/src/main/java/io/onedev/server/web/editable/pathpattern/PathPatternEditSupport.javaindex 550446e6ee..101b97427d 100644--- a/core/src/main/java/io/onedev/server/web/editable/pathpattern/PathPatternEditSupport.java+++ b/core/src/main/java/io/onedev/server/web/editable/pathpattern/PathPatternEditSupport.java@@ -55,4 +55,9 @@ public class PathPatternEditSupport implements EditSupport {}}+ @Override+ public int getPriority() {+ return DEFAULT_PRIORITY;+ }+}diff --git a/core/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicEditSuport.java b/core/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicEditSuport.javaindex 8bb0cf4852..3117d47c4c 100644--- a/core/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicEditSuport.java+++ b/core/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicEditSuport.java@@ -50,4 +50,9 @@ public class PolymorphicEditSuport implements EditSupport {}}+ @Override+ public int getPriority() {+ return DEFAULT_PRIORITY;+ }+}diff --git a/core/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicPropertyEditor.html b/core/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicPropertyEditor.htmlindex d616663115..90788e16d3 100644--- a/core/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicPropertyEditor.html+++ b/core/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicPropertyEditor.html@@ -1,19 +1,8 @@<wicket:panel>- <div wicket:id="content" class="polymorphic"></div>- <wicket:fragment wicket:id="verticalFrag">+ <div class="polymorphic"><div wicket:id="typeSelectorContainer" class="type-selector"><select wicket:id="typeSelector" class="form-control"></select></div><div wicket:id="beanEditor"></div>- </wicket:fragment>- <wicket:fragment wicket:id="horizontalFrag">- <table>- <tbody>- <tr>- <td wicket:id="typeSelectorContainer" class="type-selector"><select wicket:id="typeSelector" class="form-control"></select></td>- <td><div wicket:id="beanEditor"></div></td>- </tr>- </tbody>- </table>- </wicket:fragment>+ </div></wicket:panel>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicPropertyEditor.java b/core/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicPropertyEditor.javaindex 9282d84194..86550aa195 100644--- a/core/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicPropertyEditor.java+++ b/core/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicPropertyEditor.java@@ -1,7 +1,6 @@package io.onedev.server.web.editable.polymorphic;import java.io.Serializable;-import java.lang.reflect.Method;import java.util.ArrayList;import java.util.List;@@ -13,7 +12,6 @@ import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.event.IEvent;import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.form.DropDownChoice;-import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.Model;@@ -31,9 +29,7 @@ import io.onedev.server.web.editable.ErrorContext;import io.onedev.server.web.editable.PathSegment;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;-import io.onedev.server.web.editable.annotation.Horizontal;import io.onedev.server.web.editable.annotation.NameOfEmptyValue;-import io.onedev.server.web.editable.annotation.Vertical;@SuppressWarnings("serial")public class PolymorphicPropertyEditor extends PropertyEditor<Serializable> {@@ -42,10 +38,6 @@ public class PolymorphicPropertyEditor extends PropertyEditor<Serializable> {private final List<Class<?>> implementations = new ArrayList<>();- private final boolean vertical;-- private Fragment fragment;-public PolymorphicPropertyEditor(String id, PropertyDescriptor propertyDescriptor, IModel<Serializable> propertyModel) {super(id, propertyDescriptor, propertyModel);@@ -58,14 +50,6 @@ public class PolymorphicPropertyEditor extends PropertyEditor<Serializable> {"Can not find implementations for '" + baseClass + "'.");EditableUtils.sortAnnotatedElements(implementations);-- Method propertyGetter = propertyDescriptor.getPropertyGetter();- if (propertyGetter.getAnnotation(Vertical.class) != null)- vertical = true;- else if (propertyGetter.getAnnotation(Horizontal.class) != null)- vertical = false;- else- vertical = true;}private String getDisplayName(Class<?> clazz) {@@ -78,16 +62,6 @@ public class PolymorphicPropertyEditor extends PropertyEditor<Serializable> {protected void onInitialize() {super.onInitialize();- if (vertical) {- fragment = new Fragment("content", "verticalFrag", this);- fragment.add(AttributeAppender.append("class", " vertical"));- } else {- fragment = new Fragment("content", "horizontalFrag", this);- fragment.add(AttributeAppender.append("class", " horizontal"));- }-- add(fragment);-List<String> implementationNames = new ArrayList<String>();for (Class<?> each: implementations)implementationNames.add(getDisplayName(each));@@ -105,7 +79,7 @@ public class PolymorphicPropertyEditor extends PropertyEditor<Serializable> {}));- fragment.add(typeSelectorContainer);+ add(typeSelectorContainer);DropDownChoice<String> typeSelector = new DropDownChoice<String>("typeSelector", new IModel<String>() {@@ -115,7 +89,7 @@ public class PolymorphicPropertyEditor extends PropertyEditor<Serializable> {@Overridepublic String getObject() {- Component beanEditor = fragment.get(BEAN_EDITOR_ID);+ Component beanEditor = PolymorphicPropertyEditor.this.get(BEAN_EDITOR_ID);if (beanEditor instanceof BeanEditor) {return EditableUtils.getDisplayName(((BeanEditor) beanEditor).getBeanDescriptor().getBeanClass());} else {@@ -136,7 +110,7 @@ public class PolymorphicPropertyEditor extends PropertyEditor<Serializable> {break;}}- fragment.replace(newBeanEditor(propertyValue));+ PolymorphicPropertyEditor.this.replace(newBeanEditor(propertyValue));}}, implementationNames) {@@ -161,13 +135,13 @@ public class PolymorphicPropertyEditor extends PropertyEditor<Serializable> {@Overrideprotected void onUpdate(AjaxRequestTarget target) {onPropertyUpdating(target);- target.add(fragment.get(BEAN_EDITOR_ID));+ target.add(get(BEAN_EDITOR_ID));}});typeSelectorContainer.add(typeSelector);- fragment.add(newBeanEditor(getModelObject()));+ add(newBeanEditor(getModelObject()));}@Override@@ -199,12 +173,12 @@ public class PolymorphicPropertyEditor extends PropertyEditor<Serializable> {@Overridepublic ErrorContext getErrorContext(PathSegment pathSegment) {- return ((ErrorContext) fragment.get(BEAN_EDITOR_ID)).getErrorContext(pathSegment);+ return ((ErrorContext) get(BEAN_EDITOR_ID)).getErrorContext(pathSegment);}@Overrideprotected Serializable convertInputToValue() throws ConversionException {- Component beanEditor = fragment.get(BEAN_EDITOR_ID);+ Component beanEditor = get(BEAN_EDITOR_ID);if (beanEditor instanceof BeanEditor)return ((BeanEditor) beanEditor).getConvertedInput();elsediff --git a/core/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicPropertyViewer.html b/core/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicPropertyViewer.htmlindex b9c3a05a31..22de39c0ca 100644--- a/core/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicPropertyViewer.html+++ b/core/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicPropertyViewer.html@@ -1,17 +1,6 @@<wicket:panel>- <div wicket:id="content" class="polymorphic"></div>- <wicket:fragment wicket:id="horizontalFrag">- <table>- <tbody>- <tr>- <td wicket:id="type" class="type-selector"></td>- <td wicket:id="beanViewer"></td>- </tr>- </tbody>- </table>- </wicket:fragment>- <wicket:fragment wicket:id="verticalFrag">+ <div class="polymorphic"><div wicket:id="type" class="type-selector"></div><div wicket:id="beanViewer"></div>- </wicket:fragment>+ </div></wicket:panel>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicPropertyViewer.java b/core/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicPropertyViewer.javaindex 5a4ec02845..a361fd7b35 100644--- a/core/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicPropertyViewer.java+++ b/core/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicPropertyViewer.java@@ -1,60 +1,34 @@package io.onedev.server.web.editable.polymorphic;import java.io.Serializable;-import java.lang.reflect.Method;import org.apache.wicket.Application;-import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.markup.html.panel.Panel;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.EditableUtils;import io.onedev.server.web.editable.PropertyDescriptor;-import io.onedev.server.web.editable.annotation.Horizontal;-import io.onedev.server.web.editable.annotation.Vertical;@SuppressWarnings("serial")public class PolymorphicPropertyViewer extends Panel {private final Serializable propertyValue;- private final boolean vertical;-public PolymorphicPropertyViewer(String id, PropertyDescriptor propertyDescriptor, Serializable propertyValue) {super(id);this.propertyValue = propertyValue;-- Method propertyGetter = propertyDescriptor.getPropertyGetter();- if (propertyGetter.getAnnotation(Vertical.class) != null)- vertical = true;- else if (propertyGetter.getAnnotation(Horizontal.class) != null)- vertical = false;- else- vertical = true;}@Overrideprotected void onInitialize() {super.onInitialize();- Fragment fragment;- if (vertical)- fragment = new Fragment("content", "verticalFrag", this);- else- fragment = new Fragment("content", "horizontalFrag", this);- if (vertical)- fragment.add(AttributeAppender.append("class", " vertical"));- else- fragment.add(AttributeAppender.append("class", " horizontal"));- add(fragment);-String displayName = EditableUtils.getDisplayName(propertyValue.getClass());displayName = Application.get().getResourceSettings().getLocalizer().getString(displayName, this, displayName);- fragment.add(new Label("type", displayName));- fragment.add(BeanContext.viewBean("beanViewer", propertyValue));+ add(new Label("type", displayName));+ add(BeanContext.viewBean("beanViewer", propertyValue));}}diff --git a/core/src/main/java/io/onedev/server/web/editable/polymorphiclist/PolymorphicListEditSupport.java b/core/src/main/java/io/onedev/server/web/editable/polymorphiclist/PolymorphicListEditSupport.javaindex 38ad6ae275..ce203b6d19 100644--- a/core/src/main/java/io/onedev/server/web/editable/polymorphiclist/PolymorphicListEditSupport.java+++ b/core/src/main/java/io/onedev/server/web/editable/polymorphiclist/PolymorphicListEditSupport.java@@ -54,4 +54,9 @@ public class PolymorphicListEditSupport implements EditSupport {return null;}+ @Override+ public int getPriority() {+ return DEFAULT_PRIORITY;+ }+}diff --git a/core/src/main/java/io/onedev/server/web/editable/polymorphiclist/PolymorphicListPropertyEditor.html b/core/src/main/java/io/onedev/server/web/editable/polymorphiclist/PolymorphicListPropertyEditor.htmlindex 5aa12f4ec2..9d18925cba 100644--- a/core/src/main/java/io/onedev/server/web/editable/polymorphiclist/PolymorphicListPropertyEditor.html+++ b/core/src/main/java/io/onedev/server/web/editable/polymorphiclist/PolymorphicListPropertyEditor.html@@ -1,43 +1,33 @@<wicket:panel>- <table wicket:id="listEditor" class="polymorphic list table table-hover">- <tbody>- <!-- Put no-elements row here as Firefox has some issues displaying top border- of no-elements if tbody is empty -->- <tr wicket:id="noElements" class="no-elements">- <td>No elements defined</td>- </tr>- <tr wicket:id="elements"></tr>- </tbody>- <tfoot>- <tr class="add-element">- <td colspan="3"><a wicket:id="addElement" class="btn btn-default"><span class="fa fa-plus-circle add"></span> <span wicket:id="label"></span></a></td>- </tr>- </tfoot>- </table>- <wicket:fragment wicket:id="horizontalFrag">- <td class="type-selector">- <select wicket:id="elementTypeSelector" class="form-control"></select>- </td>- <td>- <div wicket:id="elementEditor"></div>- <div wicket:id="feedback"></div>- </td>- <td class="actions">- <a wicket:id="deleteElement" title="Delete this element"><span class="delete icon"></span></a>- <span class="move icon handle" title="Drag to reorder elements"></span>- </td>- </wicket:fragment>- <wicket:fragment wicket:id="verticalFrag">- <td>- <div class="type-selector">- <select wicket:id="elementTypeSelector" class="form-control"></select>- </div>- <div wicket:id="elementEditor"></div>- <div wicket:id="feedback"></div>- </td>- <td class="actions">- <a wicket:id="deleteElement" title="Delete this element"><span class="delete icon"></span></a>- <span class="move icon handle" title="Drag to reorder elements"></span>- </td>- </wicket:fragment>+ <div class="polymorphic-list list">+ <div class="head">+ <a wicket:id="addElement" title="Add new" class="btn btn-default btn-xs add-element"><span class="fa fa-plus"></span></a>+ </div>+ <table class="table table-condensed">+ <tbody>+ <tr wicket:id="elements">+ <td>+ <div class="head clearfix">+ <div class="type-selector pull-left">+ <select wicket:id="elementTypeSelector" class="form-control"></select>+ </div>+ <div class="actions pull-left">+ <a wicket:id="deleteElement" title="Delete this"><i class="fa fa-trash"></i></a>+ <span class="drag-indicator fa fa-reorder"></span>+ </div>+ </div>+ <div class="body">+ <div wicket:id="elementEditor"></div>+ <div wicket:id="feedback"></div>+ </div>+ </td>+ </tr>+ </tbody>+ <tfoot wicket:id="noElements">+ <tr>+ <td class="no-elements">No elements defined</td>+ </tr>+ </tfoot>+ </table>+ </div></wicket:panel>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/editable/polymorphiclist/PolymorphicListPropertyEditor.java b/core/src/main/java/io/onedev/server/web/editable/polymorphiclist/PolymorphicListPropertyEditor.javaindex 59ade2d18a..a3096a86eb 100644--- a/core/src/main/java/io/onedev/server/web/editable/polymorphiclist/PolymorphicListPropertyEditor.java+++ b/core/src/main/java/io/onedev/server/web/editable/polymorphiclist/PolymorphicListPropertyEditor.java@@ -3,7 +3,6 @@ package io.onedev.server.web.editable.polymorphiclist;import static de.agilecoders.wicket.jquery.JQuery.$;import java.io.Serializable;-import java.lang.reflect.Method;import java.util.ArrayList;import java.util.Iterator;import java.util.List;@@ -17,10 +16,8 @@ import org.apache.wicket.behavior.AttributeAppender;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.basic.Label;import org.apache.wicket.markup.html.form.DropDownChoice;import org.apache.wicket.markup.html.form.Form;-import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.markup.repeater.RepeatingView;import org.apache.wicket.model.IModel;import org.apache.wicket.util.convert.ConversionException;@@ -39,8 +36,6 @@ import io.onedev.server.web.editable.ErrorContext;import io.onedev.server.web.editable.PathSegment;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;-import io.onedev.server.web.editable.annotation.Horizontal;-import io.onedev.server.web.editable.annotation.Vertical;import io.onedev.utils.ClassUtils;@SuppressWarnings("serial")@@ -50,7 +45,9 @@ public class PolymorphicListPropertyEditor extends PropertyEditor<List<Serializaprivate final List<Class<?>> implementations;- private final boolean horizontal;+ private RepeatingView rows;++ private WebMarkupContainer noElements;public PolymorphicListPropertyEditor(String id, PropertyDescriptor propertyDescriptor, IModel<List<Serializable>> model) {super(id, propertyDescriptor, model);@@ -67,14 +64,6 @@ public class PolymorphicListPropertyEditor extends PropertyEditor<List<Serializa"Can not find implementations for '" + baseClass + "'.");EditableUtils.sortAnnotatedElements(implementations);-- Method propertyGetter = propertyDescriptor.getPropertyGetter();- if (propertyGetter.getAnnotation(Horizontal.class) != null)- horizontal = true;- else if (propertyGetter.getAnnotation(Vertical.class) != null)- horizontal = false;- else- horizontal = true;}@SuppressWarnings("unchecked")@@ -101,56 +90,17 @@ public class PolymorphicListPropertyEditor extends PropertyEditor<List<Serializasuper.onInitialize();List<Serializable> list = getModelObject();- if (list == null && getDescriptor().isPropertyRequired())+ if (list == null)list = newList();- add(newListEditor(list));- }-- @Override- protected String getErrorClass() {- return null;- }-- private Component newListEditor(List<Serializable> list) {- final WebMarkupContainer table = new WebMarkupContainer("listEditor");- if (horizontal)- table.add(AttributeAppender.append("class", " horizontal"));- else- table.add(AttributeAppender.append("class", " vertical"));-- table.setOutputMarkupId(true);- table.setOutputMarkupPlaceholderTag(true);-- final RepeatingView rows = new RepeatingView("elements");- table.add(rows);- if (list != null) {- for (Serializable element: list) {- addRow(rows, element);- }- } else {- table.setVisible(false);- }+ rows = new RepeatingView("elements");+ add(rows);- final WebMarkupContainer noElements = new WebMarkupContainer("noElements") {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(rows.size() == 0);- }-- };- noElements.setOutputMarkupPlaceholderTag(true);- table.add(noElements);+ for (Serializable element: list) {+ addRow(element);+ }- table.add(new AjaxButton("addElement") {-- @Override- protected void onInitialize() {- super.onInitialize();- add(new Label("label", "Add " + EditableUtils.getDisplayName(baseClass)));- }+ add(new AjaxButton("addElement") {@SuppressWarnings("deprecation")@Override@@ -169,26 +119,35 @@ public class PolymorphicListPropertyEditor extends PropertyEditor<List<Serializa} catch (InstantiationException | IllegalAccessException e) {throw new RuntimeException(e);}- Component newRow = addRow(rows, newElement);+ Component newRow = addRow(newElement);String script = String.format("$('<tr id=\"%s\"></tr>')", newRow.getMarkupId());if (lastRow != null)script += ".insertAfter('#" + lastRow.getMarkupId() + "');";else- script += ".appendTo('#" + table.getMarkupId() + ">tbody');";+ script += ".appendTo('#" + PolymorphicListPropertyEditor.this.getMarkupId() + ">div>table>tbody');";target.prependJavaScript(script);target.add(newRow);-- if (rows.size() == 1)- target.add(noElements);+ target.add(noElements);onPropertyUpdating(target);}}.setDefaultFormProcessing(false));- table.add(new SortBehavior() {+ add(noElements = new WebMarkupContainer("noElements") {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(rows.size() == 0);+ }++ });+ noElements.setOutputMarkupPlaceholderTag(true);++ add(new SortBehavior() {@SuppressWarnings("deprecation")@Override@@ -208,8 +167,8 @@ public class PolymorphicListPropertyEditor extends PropertyEditor<List<Serializa// Do not use code above as removing components outside of a container and add again// can cause the fenced feedback panel not functioning properly- int fromIndex = from.getItemIndex() - 1;- int toIndex = to.getItemIndex() - 1;+ int fromIndex = from.getItemIndex();+ int toIndex = to.getItemIndex();if (fromIndex < toIndex) {for (int i=0; i<toIndex-fromIndex; i++)rows.swap(fromIndex+i, fromIndex+i+1);@@ -220,18 +179,19 @@ public class PolymorphicListPropertyEditor extends PropertyEditor<List<SerializaonPropertyUpdating(target);}- }.sortable("tbody").handle(".handle").helperClass("sort-helper"));+ }.sortable("tbody"));++ setOutputMarkupId(true);+ }- return table;+ @Override+ protected String getErrorClass() {+ return null;}- private WebMarkupContainer addRow(final RepeatingView rows, Serializable element) {- final Fragment row;- if (horizontal)- row = new Fragment(rows.newChildId(), "horizontalFrag", this);- else- row = new Fragment(rows.newChildId(), "verticalFrag", this);-+ private WebMarkupContainer addRow(Serializable element) {+ WebMarkupContainer row = new WebMarkupContainer(rows.newChildId());+ row.setOutputMarkupId(true);rows.add(row);List<String> implementationNames = new ArrayList<String>();@@ -301,11 +261,8 @@ public class PolymorphicListPropertyEditor extends PropertyEditor<List<Serializatarget.appendJavaScript(String.format("onedev.server.form.markDirty($('#%s'));", form.getMarkupId(true)));target.appendJavaScript($(row).chain("remove").get());rows.remove(row);+ target.add(noElements);- if (rows.size() == 0) {- WebMarkupContainer table = (WebMarkupContainer) PolymorphicListPropertyEditor.this.get("listEditor");- target.add(table.get("noElements"));- }onPropertyUpdating(target);}@@ -340,8 +297,6 @@ public class PolymorphicListPropertyEditor extends PropertyEditor<List<Serializapublic ErrorContext getErrorContext(PathSegment pathSegment) {int index = ((PathSegment.Element) pathSegment).getIndex();- RepeatingView rows = (RepeatingView) get("listEditor").get("elements");-int currentIndex = 0;Iterator<Component> it = rows.iterator();Component row = it.next();@@ -355,7 +310,6 @@ public class PolymorphicListPropertyEditor extends PropertyEditor<List<Serializa@Overrideprotected List<Serializable> convertInputToValue() throws ConversionException {List<Serializable> newList = newList();- RepeatingView rows = (RepeatingView) get("listEditor").get("elements");for (Component row: rows) {BeanEditor elementEditor = (BeanEditor) row.get("elementEditor");newList.add(elementEditor.getConvertedInput());diff --git a/core/src/main/java/io/onedev/server/web/editable/polymorphiclist/PolymorphicListPropertyViewer.html b/core/src/main/java/io/onedev/server/web/editable/polymorphiclist/PolymorphicListPropertyViewer.htmlindex c005749aa3..3bb67e33bf 100644--- a/core/src/main/java/io/onedev/server/web/editable/polymorphiclist/PolymorphicListPropertyViewer.html+++ b/core/src/main/java/io/onedev/server/web/editable/polymorphiclist/PolymorphicListPropertyViewer.html@@ -1,24 +1,19 @@<wicket:panel>- <table wicket:id="table" class="polymorphic list table table-condensed">+ <table class="polymorphic-list table table-condensed"><tbody><tr wicket:id="elements">- <wicket:container wicket:id="content"></wicket:container>+ <td>+ <div wicket:id="elementType" class="type-selector"></div>+ <div wicket:id="element"></div>+ </td></tr>- </tbody>+ </tbody>+ <wicket:enclosure child="noElements"><tfoot>- <tr wicket:id="noElements">- <td class="no-elements">No elements defined</td>+ <tr>+ <td wicket:id="noElements" class="no-elements">No elements defined</td></tr></tfoot>+ </wicket:enclosure></table>- <wicket:fragment wicket:id="horizontalFrag">- <td wicket:id="elementType" class="type-selector"></td>- <td wicket:id="element"></td>- </wicket:fragment>- <wicket:fragment wicket:id="verticalFrag">- <td>- <div wicket:id="elementType" class="type-selector"></div>- <div wicket:id="element"></div>- </td>- </wicket:fragment></wicket:panel>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/editable/polymorphiclist/PolymorphicListPropertyViewer.java b/core/src/main/java/io/onedev/server/web/editable/polymorphiclist/PolymorphicListPropertyViewer.javaindex bc3a2ca7ff..85677fc946 100644--- a/core/src/main/java/io/onedev/server/web/editable/polymorphiclist/PolymorphicListPropertyViewer.java+++ b/core/src/main/java/io/onedev/server/web/editable/polymorphiclist/PolymorphicListPropertyViewer.java@@ -1,74 +1,45 @@package io.onedev.server.web.editable.polymorphiclist;import java.io.Serializable;-import java.lang.reflect.Method;import java.util.List;import org.apache.wicket.Application;-import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.list.ListItem;import org.apache.wicket.markup.html.list.ListView;-import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.markup.html.panel.Panel;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.EditableUtils;import io.onedev.server.web.editable.PropertyDescriptor;-import io.onedev.server.web.editable.annotation.Horizontal;-import io.onedev.server.web.editable.annotation.Vertical;@SuppressWarnings("serial")public class PolymorphicListPropertyViewer extends Panel {private final List<Serializable> elements;- private final boolean horizontal;-public PolymorphicListPropertyViewer(String id, PropertyDescriptor propertyDescriptor, List<Serializable> elements) {super(id);this.elements = elements;-- Method propertyGetter = propertyDescriptor.getPropertyGetter();- if (propertyGetter.getAnnotation(Horizontal.class) != null)- horizontal = true;- else if (propertyGetter.getAnnotation(Vertical.class) != null)- horizontal = false;- else- horizontal = true;}@Overrideprotected void onInitialize() {super.onInitialize();- WebMarkupContainer table = new WebMarkupContainer("table");- if (horizontal)- table.add(AttributeAppender.append("class", " horizontal"));- else- table.add(AttributeAppender.append("class", " vertical"));- add(table);-- table.add(new ListView<Serializable>("elements", elements) {+ add(new ListView<Serializable>("elements", elements) {@Overrideprotected void populateItem(ListItem<Serializable> item) {- Fragment fragment;- if (horizontal)- fragment = new Fragment("content", "horizontalFrag", PolymorphicListPropertyViewer.this);- else- fragment = new Fragment("content", "verticalFrag", PolymorphicListPropertyViewer.this);- item.add(fragment);-String displayName = EditableUtils.getDisplayName(item.getModelObject().getClass());displayName = Application.get().getResourceSettings().getLocalizer().getString(displayName, this, displayName);- fragment.add(new Label("elementType", displayName));- fragment.add(BeanContext.viewBean("element", item.getModelObject()));+ item.add(new Label("elementType", displayName));+ item.add(BeanContext.viewBean("element", item.getModelObject()));}});- table.add(new WebMarkupContainer("noElements").setVisible(elements.isEmpty()));+ add(new WebMarkupContainer("noElements").setVisible(elements.isEmpty()));}}diff --git a/core/src/main/java/io/onedev/server/web/editable/pullrequestchoice/PullRequestEditSupport.java b/core/src/main/java/io/onedev/server/web/editable/pullrequestchoice/PullRequestEditSupport.javaindex 7adaf7299f..029f41a382 100644--- a/core/src/main/java/io/onedev/server/web/editable/pullrequestchoice/PullRequestEditSupport.java+++ b/core/src/main/java/io/onedev/server/web/editable/pullrequestchoice/PullRequestEditSupport.java@@ -55,4 +55,9 @@ public class PullRequestEditSupport implements EditSupport {}}+ @Override+ public int getPriority() {+ return DEFAULT_PRIORITY;+ }+}diff --git a/core/src/main/java/io/onedev/server/web/editable/pullrequestquery/PullRequestQueryEditSupport.java b/core/src/main/java/io/onedev/server/web/editable/pullrequestquery/PullRequestQueryEditSupport.javaindex b118e7261a..893b5ea2bc 100644--- a/core/src/main/java/io/onedev/server/web/editable/pullrequestquery/PullRequestQueryEditSupport.java+++ b/core/src/main/java/io/onedev/server/web/editable/pullrequestquery/PullRequestQueryEditSupport.java@@ -55,4 +55,9 @@ public class PullRequestQueryEditSupport implements EditSupport {}}+ @Override+ public int getPriority() {+ return DEFAULT_PRIORITY;+ }+}diff --git a/core/src/main/java/io/onedev/server/web/editable/reviewrequirementspec/ReviewRequirementSpecEditSupport.java b/core/src/main/java/io/onedev/server/web/editable/reviewrequirementspec/ReviewRequirementSpecEditSupport.javaindex 8f7d7b4260..c501f489ac 100644--- a/core/src/main/java/io/onedev/server/web/editable/reviewrequirementspec/ReviewRequirementSpecEditSupport.java+++ b/core/src/main/java/io/onedev/server/web/editable/reviewrequirementspec/ReviewRequirementSpecEditSupport.java@@ -55,4 +55,9 @@ public class ReviewRequirementSpecEditSupport implements EditSupport {}}+ @Override+ public int getPriority() {+ return DEFAULT_PRIORITY;+ }+}diff --git a/core/src/main/java/io/onedev/server/web/editable/script/ScriptEditSupport.java b/core/src/main/java/io/onedev/server/web/editable/script/ScriptEditSupport.javaindex 522efd66fc..af4fa527aa 100644--- a/core/src/main/java/io/onedev/server/web/editable/script/ScriptEditSupport.java+++ b/core/src/main/java/io/onedev/server/web/editable/script/ScriptEditSupport.java@@ -51,4 +51,9 @@ public class ScriptEditSupport implements EditSupport {}}+ @Override+ public int getPriority() {+ return DEFAULT_PRIORITY;+ }+}diff --git a/core/src/main/java/io/onedev/server/web/editable/string/StringEditSupport.java b/core/src/main/java/io/onedev/server/web/editable/string/StringEditSupport.javaindex 10cd140fec..2f3a9a31f1 100644--- a/core/src/main/java/io/onedev/server/web/editable/string/StringEditSupport.java+++ b/core/src/main/java/io/onedev/server/web/editable/string/StringEditSupport.java@@ -78,4 +78,9 @@ public class StringEditSupport implements EditSupport {}+ @Override+ public int getPriority() {+ return DEFAULT_PRIORITY;+ }+}diff --git a/core/src/main/java/io/onedev/server/web/editable/string/StringPropertyEditor.html b/core/src/main/java/io/onedev/server/web/editable/string/StringPropertyEditor.htmlindex e323c213a6..0002a7140a 100644--- a/core/src/main/java/io/onedev/server/web/editable/string/StringPropertyEditor.html+++ b/core/src/main/java/io/onedev/server/web/editable/string/StringPropertyEditor.html@@ -2,7 +2,7 @@<div wicket:id="content"></div><wicket:fragment wicket:id="singleLineFrag"><div class="clearable-wrapper">- <input wicket:id="input" type="text" class="form-control"></input>+ <input wicket:id="input" type="text" class="form-control"></div></wicket:fragment><wicket:fragment wicket:id="multiLineFrag">diff --git a/core/src/main/java/io/onedev/server/web/editable/tagpattern/TagPatternEditSupport.java b/core/src/main/java/io/onedev/server/web/editable/tagpattern/TagPatternEditSupport.javaindex 116444304d..b0bda82339 100644--- a/core/src/main/java/io/onedev/server/web/editable/tagpattern/TagPatternEditSupport.java+++ b/core/src/main/java/io/onedev/server/web/editable/tagpattern/TagPatternEditSupport.java@@ -55,4 +55,9 @@ public class TagPatternEditSupport implements EditSupport {}}+ @Override+ public int getPriority() {+ return DEFAULT_PRIORITY;+ }+}diff --git a/core/src/main/java/io/onedev/server/web/editable/userchoice/UserEditSupport.java b/core/src/main/java/io/onedev/server/web/editable/userchoice/UserEditSupport.javaindex d78d6c1a13..8233cfe07f 100644--- a/core/src/main/java/io/onedev/server/web/editable/userchoice/UserEditSupport.java+++ b/core/src/main/java/io/onedev/server/web/editable/userchoice/UserEditSupport.java@@ -85,4 +85,9 @@ public class UserEditSupport implements EditSupport {}}+ @Override+ public int getPriority() {+ return DEFAULT_PRIORITY;+ }+}diff --git a/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueFieldListPage.java b/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueFieldListPage.javaindex 5d377ec4a9..ab3a0533e0 100644--- a/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueFieldListPage.java+++ b/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueFieldListPage.java@@ -126,6 +126,20 @@ public class IssueFieldListPage extends GlobalIssueSettingPage {});+ columns.add(new AbstractColumn<InputSpec, Void>(Model.of("")) {++ @Override+ public void populateItem(Item<ICellPopulator<InputSpec>> cellItem, String componentId, IModel<InputSpec> rowModel) {+ cellItem.add(new Label(componentId, "<a title='Click the row for more info'><i class='fa fa-ellipsis-h'></i></a>").setEscapeModelStrings(false));+ }++ @Override+ public String getCssClass() {+ return "ellipsis";+ }++ });+IDataProvider<InputSpec> dataProvider = new ListDataProvider<InputSpec>() {@Overridediff --git a/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueStateListPage.java b/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueStateListPage.javaindex 71a16d3444..ff88b050e9 100644--- a/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueStateListPage.java+++ b/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueStateListPage.java@@ -162,6 +162,20 @@ public class IssueStateListPage extends GlobalIssueSettingPage {});+ columns.add(new AbstractColumn<StateSpec, Void>(Model.of("")) {++ @Override+ public void populateItem(Item<ICellPopulator<StateSpec>> cellItem, String componentId, IModel<StateSpec> rowModel) {+ cellItem.add(new Label(componentId, "<a title='Click the row for more info'><i class='fa fa-ellipsis-h'></i></a>").setEscapeModelStrings(false));+ }++ @Override+ public String getCssClass() {+ return "ellipsis";+ }++ });+IDataProvider<StateSpec> dataProvider = new ListDataProvider<StateSpec>() {@Overridediff --git a/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/issue-setting.css b/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/issue-setting.cssindex 73b3d72767..d23be690fd 100644--- a/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/issue-setting.css+++ b/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/issue-setting.css@@ -1,4 +1,4 @@-.floating.field-spec>.content>.body>div>.bean.viewer>.properties>table>tbody>tr>td.name {+.floating.field-spec>.content>.body>div>.bean-viewer>.bean-properties>table>tbody>tr>td.name {min-width: 150px;}diff --git a/core/src/main/java/io/onedev/server/web/page/base/base.css b/core/src/main/java/io/onedev/server/web/page/base/base.cssindex 1c382e3833..048ea20d9f 100644--- a/core/src/main/java/io/onedev/server/web/page/base/base.css+++ b/core/src/main/java/io/onedev/server/web/page/base/base.css@@ -139,17 +139,11 @@ form>.test-feedback {}/* Editor and Viewer */-.editable table.list {- margin-bottom: 0;-}-.editable table.list>tfoot>tr.add-element>td {- padding: 12px 0;-}-.editable>.bean>table {+.editable>.bean-properties>table {width: 100%;}-.editable>.bean>table>tbody>tr>td {+.editable>.bean-properties>table>tbody>tr>td {vertical-align: top;padding: 0 8px 16px 0;}@@ -159,100 +153,73 @@ form>.test-feedback {margin-bottom: 0;}-.editable>.bean>table>tbody>tr>td.name {- font-size: 12px;- line-height: 22px;+.editable>.bean-properties>table>tbody>tr>td.name {font-weight: bold;border-right: 1px solid #E0E0E0;text-align: right;white-space: nowrap;- width: 20%;+ width: 20%;+ font-size: 12px;+ line-height: 20px;}-.editable>.bean>table>tbody>tr>td.value {+.editable>.bean-properties>table>tbody>tr>td.value {padding-left: 8px;}-.editable>table.polymorphic.vertical.list>tbody>tr>td>.type-selector {- margin-bottom: 8px;+.property-editor>.polymorphic-list>table>tbody>tr>td {+ border-top: 2px solid #BBB;+ padding-top: 20px;}-.editable>.polymorphic.vertical>div.type-selector {- margin-bottom: 8px;+.property-editor>.polymorphic-list>table>tbody>tr>td>.head {+ margin-bottom: 20px;}--.editable>.polymorphic.horizontal>table {- width: 100%;+.property-editor>.polymorphic-list>table>tbody>tr>td>.head>.actions {+ font-size: 18px;+ margin-left: 20px;}-.editable>.polymorphic.horizontal>table>tbody>tr>td {- vertical-align: top;+.property-editor>.polymorphic-list>table>tbody>tr>td>.head>.actions a {+ color: #666;}-.editable>.polymorphic.horizontal>table>tbody>tr>td:first-child {- padding-right: 8px;+.property-viewer>.polymorphic-list>tbody>tr>td {+ border-top: 2px solid #BBB;+ padding-top: 12px;+ padding-bottom: 12px;}--.editor>table.list .help-block {- display: none;+.property-viewer>.polymorphic-list>tbody>tr>td>.type-selector {+ margin-bottom: 12px;}-.editor>table.list>tbody>tr>td.actions {- text-align: right;- white-space: nowrap;-}-.editor>table.list>tbody>tr>td.actions .fa {- vertical-align: center;- font-size: 16px;- color: #444;+.editable>.polymorphic>.type-selector {+ margin-bottom: 15px;}-.editor>input.enable {+.bean-editor>input.enable {margin-bottom: 12px;}-.editor .password-confirm {+.bean-editor .password-confirm {margin-top: 12px;}-.property.editor>.bean.editor {+.property.editor>.bean-editor {border-top: 1px dotted #BBB;margin-top: 4px;padding-top: 12px;margin-bottom: 12px;}-.viewer .bean>table>tbody>tr.name-omitted>td {+.bean-viewer .bean-properties>table>tbody>tr.name-omitted>td {padding-left: 0;}-.viewer .type-selector, .viewer .no-elements, .editor .no-elements {+.bean-viewer .type-selector {font-style: italic;}-.editable .bean.list>thead>tr>th {- border-bottom: 2px solid #E0E0E0;-}-.editable .viewer .bean.list>thead>tr>th {- font-size: 12px;- padding-top: 0;- line-height: 22px;- white-space: nowrap;-}-.editable table.bean.list>thead>tr>th, .editable table.bean.list>tbody>tr>td {- padding: 5px 10px 5px 0;-}-.editable table.bean.list>tbody>tr:first-child>td {- padding-top: 10px;-}-.editable table.bean.list>thead>tr>th.actions, .editable table.bean.list>tbody>tr>td.actions {- padding-right: 0;- padding-left: 10px;- width: 1%;-}-.editable .editor table.bean.list tr:hover td {- background: #F9F9F9;-}-.editable .editor table.bean.list tr.add-element:hover td {- background: none;-}+.bean-editor .bean-list>table>tbody>tr>td {+ border-top: none;+}/* Select2 */-.editor .select2-container {+.bean-editor .select2-container {width: 100%;}.input-group .select2-container.form-control .select2-choice,@@ -685,3 +652,11 @@ a.disabled, a[disabled="disabled"] {.floating.side.def-detail .actions {margin-bottom: 12px;}++td.no-elements {+ font-style: italic;+}++td.ellipsis {+ font-size: 16px;+}\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/BlobEditPanel.html b/core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/BlobEditPanel.htmlindex f0f0818b6a..e494ae00bf 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/BlobEditPanel.html+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/BlobEditPanel.html@@ -8,7 +8,7 @@<div wicket:id="editOptions" class="options pull-right expanded"></div></div><div class="body">- <form wicket:id="content" class="content leave-confirm">+ <form wicket:id="content" class="content leave-confirm" onsubmit="return false;"><div wicket:id="editor" class="editor"></div><div wicket:id="plainEditor" class="plain-editor"></div><input wicket:id="tabSelectionInfo" type="hidden" class="tab-selection-info">diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecBlobEditPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecBlobEditPanel.javanew file mode 100644index 0000000000..8b2eeda2ba--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecBlobEditPanel.java@@ -0,0 +1,109 @@+package io.onedev.server.web.page.project.blob.render.renderers.buildspec;++import org.apache.wicket.Component;+import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;+import org.apache.wicket.ajax.attributes.IAjaxCallListener;+import org.apache.wicket.ajax.markup.html.form.AjaxSubmitLink;+import org.apache.wicket.markup.head.CssHeaderItem;+import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.html.form.FormComponentPanel;++import io.onedev.server.build.BuildSpec;+import io.onedev.server.web.page.project.blob.render.BlobRenderContext;+import io.onedev.server.web.page.project.blob.render.edit.BlobEditPanel;+import io.onedev.server.web.page.project.blob.render.edit.plain.PlainEditPanel;+import io.onedev.server.web.page.project.blob.render.edit.plain.PlainEditSupport;++@SuppressWarnings("serial")+public class BuildSpecBlobEditPanel extends BlobEditPanel {++ private PlainEditPanel plainEditor;++ public BuildSpecBlobEditPanel(String id, BlobRenderContext context) {+ super(id, context);+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(CssHeaderItem.forReference(new BuildSpecCssResourceReference()));+ }++ @Override+ protected FormComponentPanel<byte[]> newEditor(String componentId, byte[] initialContent) {+ return new BuildSpecEditPanel(componentId, context, initialContent);+ }++ @Override+ protected Component newContentSubmitLink(String componentId) {+ return new AjaxSubmitLink(componentId) {++ @Override+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {+ super.updateAjaxAttributes(attributes);+ attributes.getAjaxCallListeners().add(new IAjaxCallListener() {++ @Override+ public CharSequence getSuccessHandler(Component component) {+ return null;+ }++ @Override+ public CharSequence getPrecondition(Component component) {+ return null;+ }++ @Override+ public CharSequence getInitHandler(Component component) {+ return null;+ }++ @Override+ public CharSequence getFailureHandler(Component component) {+ return null;+ }++ @Override+ public CharSequence getDoneHandler(Component component) {+ return null;+ }++ @Override+ public CharSequence getCompleteHandler(Component component) {+ return null;+ }++ @Override+ public CharSequence getBeforeSendHandler(Component component) {+ return null;+ }++ @Override+ public CharSequence getBeforeHandler(Component component) {+ return String.format("onedev.server.plainEdit.onSubmit('%s');",+ plainEditor.getMarkupId());+ }++ @Override+ public CharSequence getAfterHandler(Component component) {+ return null;+ }+ });+ }++ };+ }++ @Override+ protected PlainEditSupport getPlainEditSupport() {+ return new PlainEditSupport() {++ @Override+ public FormComponentPanel<String> newEditor(String componentId, String initialContent) {+ return plainEditor = new PlainEditPanel(componentId, BuildSpec.BLOB_PATH, initialContent);+ }++ };+ }++}diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecViewPanel.html b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecBlobViewPanel.htmlsimilarity index 54%rename from core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecViewPanel.htmlrename to core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecBlobViewPanel.htmlindex b491436b47..97fe50d5f9 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecViewPanel.html+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecBlobViewPanel.html@@ -1,7 +1,16 @@<wicket:extend>- <div wicket:id="content" class="build-spec build-spec-viewer"></div>+ <div wicket:id="content" class="build-spec build-spec-view"></div><wicket:fragment wicket:id="validFrag">- <div wicket:id="buildSpec" class="valid"></div>+ <div class="valid">+ <div class="jobs">+ <div class="head">+ Jobs+ </div>+ <div class="body">+ <div wicket:id="jobs" class="job"></div>+ </div>+ </div>+ </div></wicket:fragment><wicket:fragment wicket:id="invalidFrag"><div class="invalid">diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecViewPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecBlobViewPanel.javasimilarity index 80%rename from core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecViewPanel.javarename to core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecBlobViewPanel.javaindex 0fa8e0dcfc..d2448e62a9 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecViewPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecBlobViewPanel.java@@ -4,10 +4,12 @@ import org.apache.commons.lang3.StringUtils;import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.html.panel.Fragment;+import org.apache.wicket.markup.repeater.RepeatingView;import com.google.common.base.Throwables;import io.onedev.server.build.BuildSpec;+import io.onedev.server.build.JobSpec;import io.onedev.server.git.Blob;import io.onedev.server.migration.VersionedDocument;import io.onedev.server.web.component.MultilineLabel;@@ -16,9 +18,9 @@ import io.onedev.server.web.page.project.blob.render.BlobRenderContext;import io.onedev.server.web.page.project.blob.render.view.BlobViewPanel;@SuppressWarnings("serial")-public class BuildSpecViewPanel extends BlobViewPanel {+public class BuildSpecBlobViewPanel extends BlobViewPanel {- public BuildSpecViewPanel(String id, BlobRenderContext context) {+ public BuildSpecBlobViewPanel(String id, BlobRenderContext context) {super(id, context);}@@ -32,7 +34,11 @@ public class BuildSpecViewPanel extends BlobViewPanel {try {BuildSpec buildSpec = (BuildSpec) VersionedDocument.fromXML(buildSpecString).toBean();Fragment fragment = new Fragment("content", "validFrag", this);- fragment.add(BeanContext.viewBean("buildSpec", buildSpec));+ RepeatingView jobsView = new RepeatingView("jobs");+ for (JobSpec job: buildSpec.getJobs()) {+ jobsView.add(BeanContext.viewBean(jobsView.newChildId(), job));+ }+ fragment.add(jobsView);add(fragment);} catch (Exception e) {Fragment fragment = new Fragment("content", "invalidFrag", this);diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecEditor.html b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecEditPanel.htmlsimilarity index 65%rename from core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecEditor.htmlrename to core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecEditPanel.htmlindex 5203e0b25e..a792d3df8d 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecEditor.html+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecEditPanel.html@@ -1,17 +1,17 @@<wicket:panel>- <div wicket:id="content" class="build-spec build-spec-editor"></div>+ <div wicket:id="content" class="build-spec build-spec-edit"></div><wicket:fragment wicket:id="validFrag"><div class="valid">- <div class="jobs specs">+ <div class="jobs"><div class="head">Jobs</div><div class="body"><div wicket:id="jobs" class="job"><div wicket:id="editor"></div>- <a wicket:id="delete" class="delete"><i class="fa fa-trash"></i> Delete</a>+ <a wicket:id="delete" class="delete btn btn-danger"><i class="fa fa-trash"></i> Delete</a></div>- <a wicket:id="addJob" class="add"><i class="fa fa-plus"></i> Add</a>+ <a wicket:id="addJob" class="add btn btn-block btn-success"><i class="fa fa-plus"></i> Add Job</a></div></div></div>diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecEditPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecEditPanel.javaindex f3042abd78..ec70ed91aa 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecEditPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecEditPanel.java@@ -1,109 +1,121 @@package io.onedev.server.web.page.project.blob.render.renderers.buildspec;+import static de.agilecoders.wicket.jquery.JQuery.$;++import java.io.Serializable;+import java.nio.charset.Charset;+import org.apache.wicket.Component;-import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;-import org.apache.wicket.ajax.attributes.IAjaxCallListener;-import org.apache.wicket.ajax.markup.html.form.AjaxSubmitLink;-import org.apache.wicket.markup.head.CssHeaderItem;-import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.markup.html.AjaxLink;+import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.form.FormComponentPanel;+import org.apache.wicket.markup.html.panel.Fragment;+import org.apache.wicket.markup.repeater.RepeatingView;+import org.apache.wicket.model.Model;++import com.google.common.base.Charsets;+import com.google.common.base.Throwables;import io.onedev.server.build.BuildSpec;+import io.onedev.server.build.JobSpec;+import io.onedev.server.migration.VersionedDocument;+import io.onedev.server.util.ContentDetector;+import io.onedev.server.web.component.MultilineLabel;+import io.onedev.server.web.editable.BeanContext;+import io.onedev.server.web.editable.BeanEditor;import io.onedev.server.web.page.project.blob.render.BlobRenderContext;-import io.onedev.server.web.page.project.blob.render.edit.BlobEditPanel;-import io.onedev.server.web.page.project.blob.render.edit.plain.PlainEditPanel;-import io.onedev.server.web.page.project.blob.render.edit.plain.PlainEditSupport;+import io.onedev.utils.StringUtils;@SuppressWarnings("serial")-public class BuildSpecEditPanel extends BlobEditPanel {+class BuildSpecEditPanel extends FormComponentPanel<byte[]> {- private PlainEditPanel plainEditor;+ private RepeatingView jobsView;- public BuildSpecEditPanel(String id, BlobRenderContext context) {- super(id, context);- }-- @Override- public void renderHead(IHeaderResponse response) {- super.renderHead(response);- response.render(CssHeaderItem.forReference(new BuildSpecCssResourceReference()));- }-- @Override- protected FormComponentPanel<byte[]> newEditor(String componentId, byte[] initialContent) {- return new BuildSpecEditor(componentId, context, initialContent);+ private Serializable parseResult;++ public BuildSpecEditPanel(String id, BlobRenderContext context, byte[] initialContent) {+ super(id, Model.of(initialContent));++ Charset detectedCharset = ContentDetector.detectCharset(getModelObject());+ Charset charset = detectedCharset!=null?detectedCharset:Charset.defaultCharset();+ String buildSpecString = new String(getModelObject(), charset);+ if (StringUtils.isNotBlank(buildSpecString)) {+ try {+ parseResult = (Serializable) VersionedDocument.fromXML(buildSpecString).toBean();+ } catch (Exception e) {+ parseResult = e;+ }+ } else {+ parseResult = new BuildSpec();+ }}- @Override- protected Component newContentSubmitLink(String componentId) {- return new AjaxSubmitLink(componentId) {+ private WebMarkupContainer newJobContainer(String componentId, JobSpec job) {+ WebMarkupContainer container = new WebMarkupContainer(jobsView.newChildId());+ container.add(BeanContext.editBean("editor", job));+ container.add(new AjaxLink<Void>("delete") {@Override- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {- super.updateAjaxAttributes(attributes);- attributes.getAjaxCallListeners().add(new IAjaxCallListener() {-- @Override- public CharSequence getSuccessHandler(Component component) {- return null;- }-- @Override- public CharSequence getPrecondition(Component component) {- return null;- }-- @Override- public CharSequence getInitHandler(Component component) {- return null;- }-- @Override- public CharSequence getFailureHandler(Component component) {- return null;- }-- @Override- public CharSequence getDoneHandler(Component component) {- return null;- }-- @Override- public CharSequence getCompleteHandler(Component component) {- return null;- }-- @Override- public CharSequence getBeforeSendHandler(Component component) {- return null;- }-- @Override- public CharSequence getBeforeHandler(Component component) {- return String.format("onedev.server.plainEdit.onSubmit('%s');",- plainEditor.getMarkupId());- }-- @Override- public CharSequence getAfterHandler(Component component) {- return null;- }- });+ public void onClick(AjaxRequestTarget target) {+ target.appendJavaScript($(container).chain("remove").get());+ jobsView.remove(container);}- };+ });+ container.setOutputMarkupId(true);+ return container;}@Override- protected PlainEditSupport getPlainEditSupport() {- return new PlainEditSupport() {+ protected void onInitialize() {+ super.onInitialize();- @Override- public FormComponentPanel<String> newEditor(String componentId, String initialContent) {- return plainEditor = new PlainEditPanel(componentId, BuildSpec.BLOB_PATH, initialContent);+ Fragment fragment;+ if (parseResult instanceof BuildSpec) {+ fragment = new Fragment("content", "validFrag", this);+ BuildSpec buildSpec = (BuildSpec) parseResult;+ jobsView = new RepeatingView("jobs");+ fragment.add(jobsView);++ for (JobSpec job: buildSpec.getJobs()) {+ jobsView.add(newJobContainer(jobsView.newChildId(), job));}+ fragment.add(new AjaxLink<Void>("addJob") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ JobSpec job = new JobSpec();+ WebMarkupContainer jobContainer = newJobContainer(jobsView.newChildId(), job);+ jobsView.add(jobContainer);+ String script = String.format("$(\"#%s\").before(\"<div id='%s'></div>\");",+ getMarkupId(), jobContainer.getMarkupId());+ target.prependJavaScript(script);+ target.add(jobContainer);+ }++ }.setOutputMarkupId(true));- };+ } else {+ fragment = new Fragment("content", "invalidFrag", this);+ fragment.add(new MultilineLabel("errorMessage", Throwables.getStackTraceAsString((Throwable) parseResult)));+ }+ add(fragment);+ }++ @Override+ public void convertInput() {+ if (parseResult instanceof BuildSpec) {+ BuildSpec buildSpec = (BuildSpec) parseResult;+ buildSpec.getJobs().clear();+ for (Component child: jobsView) {+ BeanEditor jobEditor = (BeanEditor) child.get("editor");+ buildSpec.getJobs().add((JobSpec) jobEditor.getConvertedInput());+ }+ setConvertedInput(VersionedDocument.fromBean(buildSpec).toXML().getBytes(Charsets.UTF_8));+ } else {+ setConvertedInput(getModelObject());+ }}}diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecEditor.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecEditor.javadeleted file mode 100644index c1595f7a0a..0000000000--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecEditor.java+++ /dev/null@@ -1,121 +0,0 @@-package io.onedev.server.web.page.project.blob.render.renderers.buildspec;--import static de.agilecoders.wicket.jquery.JQuery.$;--import java.io.Serializable;-import java.nio.charset.Charset;--import org.apache.wicket.Component;-import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.ajax.markup.html.AjaxLink;-import org.apache.wicket.markup.html.WebMarkupContainer;-import org.apache.wicket.markup.html.form.FormComponentPanel;-import org.apache.wicket.markup.html.panel.Fragment;-import org.apache.wicket.markup.repeater.RepeatingView;-import org.apache.wicket.model.Model;--import com.google.common.base.Charsets;-import com.google.common.base.Throwables;--import io.onedev.server.build.BuildSpec;-import io.onedev.server.build.JobSpec;-import io.onedev.server.migration.VersionedDocument;-import io.onedev.server.util.ContentDetector;-import io.onedev.server.web.component.MultilineLabel;-import io.onedev.server.web.editable.BeanContext;-import io.onedev.server.web.editable.BeanEditor;-import io.onedev.server.web.page.project.blob.render.BlobRenderContext;-import io.onedev.utils.StringUtils;--@SuppressWarnings("serial")-class BuildSpecEditor extends FormComponentPanel<byte[]> {-- private RepeatingView jobsView;-- private Serializable parseResult;-- public BuildSpecEditor(String id, BlobRenderContext context, byte[] initialContent) {- super(id, Model.of(initialContent));-- Charset detectedCharset = ContentDetector.detectCharset(getModelObject());- Charset charset = detectedCharset!=null?detectedCharset:Charset.defaultCharset();- String buildSpecString = new String(getModelObject(), charset);- if (StringUtils.isNotBlank(buildSpecString)) {- try {- parseResult = (Serializable) VersionedDocument.fromXML(buildSpecString).toBean();- } catch (Exception e) {- parseResult = e;- }- } else {- parseResult = new BuildSpec();- }- }-- private WebMarkupContainer newJobContainer(String componentId, JobSpec job) {- WebMarkupContainer container = new WebMarkupContainer(jobsView.newChildId());- container.add(BeanContext.editBean("editor", job));- container.add(new AjaxLink<Void>("delete") {-- @Override- public void onClick(AjaxRequestTarget target) {- target.appendJavaScript($(container).chain("remove").get());- jobsView.remove(container);- }-- });- container.setOutputMarkupId(true);- return container;- }-- @Override- protected void onInitialize() {- super.onInitialize();-- Fragment fragment;- if (parseResult instanceof BuildSpec) {- fragment = new Fragment("content", "validFrag", this);- BuildSpec buildSpec = (BuildSpec) parseResult;- jobsView = new RepeatingView("jobs");- fragment.add(jobsView);-- for (JobSpec job: buildSpec.getJobs()) {- jobsView.add(newJobContainer(jobsView.newChildId(), job));- }- fragment.add(new AjaxLink<Void>("addJob") {-- @Override- public void onClick(AjaxRequestTarget target) {- JobSpec job = new JobSpec();- WebMarkupContainer jobContainer = newJobContainer(jobsView.newChildId(), job);- jobsView.add(jobContainer);- String script = String.format("$(\"#%s\").before(\"<div id='%s'></div>\");",- getMarkupId(), jobContainer.getMarkupId());- target.prependJavaScript(script);- target.add(jobContainer);- }-- }.setOutputMarkupId(true));-- } else {- fragment = new Fragment("content", "invalidFrag", this);- fragment.add(new MultilineLabel("errorMessage", Throwables.getStackTraceAsString((Throwable) parseResult)));- }- add(fragment);- }-- @Override- public void convertInput() {- if (parseResult instanceof BuildSpec) {- BuildSpec buildSpec = (BuildSpec) parseResult;- buildSpec.getJobs().clear();- for (Component child: jobsView) {- BeanEditor jobEditor = (BeanEditor) child.get("editor");- buildSpec.getJobs().add((JobSpec) jobEditor.getConvertedInput());- }- setConvertedInput(VersionedDocument.fromBean(buildSpec).toXML().getBytes(Charsets.UTF_8));- } else {- setConvertedInput(getModelObject());- }- }--}diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecRendererProvider.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecRendererProvider.javaindex 44c5ee26ba..0f73816951 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecRendererProvider.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecRendererProvider.java@@ -31,7 +31,7 @@ public class BuildSpecRendererProvider implements BlobRendererContribution {@Overridepublic Component render(String componentId) {- return new BuildSpecEditPanel(componentId, context);+ return new BuildSpecBlobEditPanel(componentId, context);}@Override@@ -54,7 +54,7 @@ public class BuildSpecRendererProvider implements BlobRendererContribution {else if (context.getMode() == Mode.VIEW_PLAIN)return new SourceViewPanel(componentId, context, true);else- return new BuildSpecViewPanel(componentId, context);+ return new BuildSpecBlobViewPanel(componentId, context);}@Overridediff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/build-spec.css b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/build-spec.cssindex 8b71513faa..0414bc9cb9 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/build-spec.css+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/build-spec.css@@ -17,21 +17,29 @@}.build-spec>.valid>div {- border: 1px solid #DDD;border-radius: 4px;}.build-spec>.valid>div>.head {- border-bottom: 1px solid #DDD;- padding: 8px 12px;font-weight: bold;- font-size: 15px;-}-.build-spec>.valid>div>.body {- padding: 20px;+ font-size: 18px;+ margin-bottom: 20px;}.build-spec>.valid>div>.body>div {- border: 1px solid #DDD;margin-bottom: 20px;- padding: 20px;border-radius: 4px;-}\ No newline at end of file+ border: 2px solid #BBB;+ padding: 20px;+}+.build-spec>.valid .bean-properties>table>tbody>tr>td.name {+ width: 200px;+}+.build-spec>.valid .bean-properties>table>tbody>tr>td.value .form-control {+ height: 32px;+ font-size: 13px;+}+.build-spec>.valid .def-list table>tbody>tr>td:first-child>div>a {+ margin-left: 0;+}+.floating.job-param>.content>.body>.bean-viewer>.bean-properties>table>tbody>tr>td.name {+ min-width: 150px;+}diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/jobparams/JobParamBean.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/jobparams/JobParamBean.javanew file mode 100644index 0000000000..8732e5bac5--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/jobparams/JobParamBean.java@@ -0,0 +1,27 @@+package io.onedev.server.web.page.project.blob.render.renderers.buildspec.jobparams;++import java.io.Serializable;++import javax.validation.constraints.NotNull;++import io.onedev.server.util.inputspec.InputSpec;+import io.onedev.server.web.editable.annotation.Editable;++@Editable+public class JobParamBean implements Serializable {++ private static final long serialVersionUID = 1L;++ private InputSpec param;++ @Editable(name="Type", order=100)+ @NotNull(message="may not be empty")+ public InputSpec getParam() {+ return param;+ }++ public void setParam(InputSpec param) {+ this.param = param;+ }++}diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/jobparams/JobParamEditPanel.html b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/jobparams/JobParamEditPanel.htmlnew file mode 100644index 0000000000..8beee93c88--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/jobparams/JobParamEditPanel.html@@ -0,0 +1,17 @@+<wicket:panel>+ <form wicket:id="form" class="job-param-edit leave-confirm">+ <div class="modal-header">+ <button wicket:id="close" type="button" class="close">×</button>+ <h4 id="modal-title" class="modal-title">+ Job Parameter+ </h4>+ </div>+ <div class="modal-body">+ <div wicket:id="editor"></div>+ </div>+ <div class="modal-footer">+ <input wicket:id="save" type="submit" class="dirty-aware btn btn-primary" value="Update">+ <a wicket:id="cancel" class="btn btn-default">Cancel</a>+ </div>+ </form>+</wicket:panel>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/jobparams/JobParamEditPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/jobparams/JobParamEditPanel.javanew file mode 100644index 0000000000..3d34c8f91d--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/jobparams/JobParamEditPanel.java@@ -0,0 +1,153 @@+package io.onedev.server.web.page.project.blob.render.renderers.buildspec.jobparams;++import java.util.ArrayList;+import java.util.List;++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.form.Form;+import org.apache.wicket.markup.html.panel.Panel;+import org.apache.wicket.request.cycle.RequestCycle;++import io.onedev.server.util.inputspec.InputContext;+import io.onedev.server.util.inputspec.InputSpec;+import io.onedev.server.web.editable.BeanContext;+import io.onedev.server.web.editable.BeanEditor;+import io.onedev.server.web.editable.PathSegment;+import io.onedev.server.web.util.ajaxlistener.ConfirmLeaveListener;++@SuppressWarnings("serial")+abstract class JobParamEditPanel extends Panel implements InputContext {++ private final List<InputSpec> params;++ private final int paramIndex;++ public JobParamEditPanel(String id, List<InputSpec> params, int paramIndex) {+ super(id);++ this.params = params;+ this.paramIndex = paramIndex;+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ JobParamBean bean = new JobParamBean();+ if (paramIndex != -1)+ bean.setParam(params.get(paramIndex));++ Form<?> form = new Form<Void>("form") {++ @Override+ protected void onError() {+ super.onError();+ RequestCycle.get().find(AjaxRequestTarget.class).add(this);+ }++ };++ form.add(new AjaxLink<Void>("close") {++ @Override+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {+ super.updateAjaxAttributes(attributes);+ attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(JobParamEditPanel.this));+ }++ @Override+ public void onClick(AjaxRequestTarget target) {+ onCancel(target);+ }++ });++ BeanEditor editor = BeanContext.editBean("editor", bean);+ form.add(editor);+ form.add(new AjaxButton("save") {++ @Override+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {+ super.onSubmit(target, form);++ InputSpec param = bean.getParam();+ if (paramIndex != -1) {+ InputSpec oldParam = params.get(paramIndex);+ if (!param.getName().equals(oldParam.getName()) && getInputSpec(param.getName()) != null) {+ editor.getErrorContext(new PathSegment.Property("param"))+ .getErrorContext(new PathSegment.Property("name"))+ .addError("This name has already been used by another parameter");+ }+ } else if (getInputSpec(param.getName()) != null) {+ editor.getErrorContext(new PathSegment.Property("param"))+ .getErrorContext(new PathSegment.Property("name"))+ .addError("This name has already been used by another parameter");+ }++ if (!editor.hasErrors(true)) {+ if (paramIndex != -1) {+ params.set(paramIndex, param);+ } else {+ params.add(param);+ }+ onSave(target);+ } else {+ target.add(form);+ }+ }++ });++ form.add(new AjaxLink<Void>("cancel") {++ @Override+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {+ super.updateAjaxAttributes(attributes);+ attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(JobParamEditPanel.this));+ }++ @Override+ public void onClick(AjaxRequestTarget target) {+ onCancel(target);+ }++ });+ form.setOutputMarkupId(true);++ add(form);+ }++ protected abstract void onSave(AjaxRequestTarget target);++ protected abstract void onCancel(AjaxRequestTarget target);++ @Override+ public List<String> getInputNames() {+ List<String> inputNames = new ArrayList<>();+ int currentIndex = 0;+ for (InputSpec param: params) {+ if (currentIndex != paramIndex)+ inputNames.add(param.getName());+ currentIndex++;+ }+ return inputNames;+ }++ @Override+ public InputSpec getInputSpec(String paramName) {+ for (InputSpec param: params) {+ if (paramName.equals(param.getName()))+ return param;+ }+ return null;+ }++ @Override+ public boolean isReservedName(String inputName) {+ return false;+ }++}diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/jobparams/JobParamEditPanel.properties b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/jobparams/JobParamEditPanel.propertiesnew file mode 100644index 0000000000..d07c87cbd4--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/jobparams/JobParamEditPanel.properties@@ -0,0 +1,6 @@+resource.input.input=When parameter+resource.input.description=Optionally describes the parameter+resource.input.showCondition=Enable if visibility of this parameter depends on other parameters+resource.input.allowEmpty=Whether or not this parameter accepts empty value+resource.input.allowMultiple=Whether or not multiple values can be specified for this parameter+resource.input.canBeChangedBy=This setting tells who can change this parameter\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/jobparams/JobParamListEditPanel.html b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/jobparams/JobParamListEditPanel.htmlnew file mode 100644index 0000000000..7cb5a99023--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/jobparams/JobParamListEditPanel.html@@ -0,0 +1,15 @@+<wicket:panel>+ <div class="job-param-list list">+ <div class="head">+ <a wicket:id="addNew" title="Add new" class="btn btn-default btn-xs"><i class="fa fa-plus"></i></a>+ </div>+ <table wicket:id="params" class="table table-condensed table-hover"></table>+ </div>+ <wicket:fragment wicket:id="nameColumnFrag">+ <span class="drag-indicator fa fa-reorder"></span>+ <a wicket:id="link"><span wicket:id="label"></span></a>+ </wicket:fragment>+ <wicket:fragment wicket:id="actionColumnFrag">+ <a wicket:id="delete" title="Delete"><i class="fa fa-trash"></i></a>+ </wicket:fragment>+</wicket:panel>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/jobparams/JobParamListEditPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/jobparams/JobParamListEditPanel.javanew file mode 100644index 0000000000..626787501c--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/jobparams/JobParamListEditPanel.java@@ -0,0 +1,226 @@+package io.onedev.server.web.page.project.blob.render.renderers.buildspec.jobparams;++import java.io.Serializable;+import java.util.ArrayList;+import java.util.Collections;+import java.util.List;++import org.apache.wicket.Component;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.markup.html.AjaxLink;+import org.apache.wicket.event.IEvent;+import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;+import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;+import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;+import org.apache.wicket.extensions.markup.html.repeater.data.table.HeadersToolbar;+import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;+import org.apache.wicket.extensions.markup.html.repeater.data.table.NoRecordsToolbar;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.panel.Fragment;+import org.apache.wicket.markup.repeater.Item;+import org.apache.wicket.markup.repeater.data.IDataProvider;+import org.apache.wicket.markup.repeater.data.ListDataProvider;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.Model;+import org.apache.wicket.util.convert.ConversionException;++import io.onedev.server.util.inputspec.InputSpec;+import io.onedev.server.web.behavior.sortable.SortBehavior;+import io.onedev.server.web.behavior.sortable.SortPosition;+import io.onedev.server.web.component.modal.ModalLink;+import io.onedev.server.web.component.modal.ModalPanel;+import io.onedev.server.web.editable.EditableUtils;+import io.onedev.server.web.editable.ErrorContext;+import io.onedev.server.web.editable.PathSegment;+import io.onedev.server.web.editable.PropertyDescriptor;+import io.onedev.server.web.editable.PropertyEditor;+import io.onedev.server.web.editable.PropertyUpdating;+import io.onedev.utils.StringUtils;++@SuppressWarnings("serial")+public class JobParamListEditPanel extends PropertyEditor<List<Serializable>> {++ private final List<InputSpec> params;++ public JobParamListEditPanel(String id, PropertyDescriptor propertyDescriptor, IModel<List<Serializable>> model) {+ super(id, propertyDescriptor, model);++ params = new ArrayList<>();+ for (Serializable each: model.getObject()) {+ params.add((InputSpec) each);+ }+ }++ private int getParamIndex(String paramName) {+ for (int i=0; i<params.size(); i++) {+ if (params.get(i).getName().equals(paramName))+ return i;+ }+ return -1;+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();+ add(new ModalLink("addNew") {++ @Override+ protected Component newContent(String id, ModalPanel modal) {+ return new JobParamEditPanel(id, params, -1) {++ @Override+ protected void onCancel(AjaxRequestTarget target) {+ modal.close();+ }++ @Override+ protected void onSave(AjaxRequestTarget target) {+ modal.close();+ target.add(JobParamListEditPanel.this);+ }++ };+ }++ });++ List<IColumn<InputSpec, Void>> columns = new ArrayList<>();++ columns.add(new AbstractColumn<InputSpec, Void>(Model.of("Name")) {++ @Override+ public void populateItem(Item<ICellPopulator<InputSpec>> cellItem, String componentId, IModel<InputSpec> rowModel) {+ Fragment fragment = new Fragment(componentId, "nameColumnFrag", JobParamListEditPanel.this);+ ModalLink link = new ModalLink("link") {++ @Override+ protected Component newContent(String id, ModalPanel modal) {+ return new JobParamEditPanel(id, params, getParamIndex(rowModel.getObject().getName())) {++ @Override+ protected void onCancel(AjaxRequestTarget target) {+ modal.close();+ }++ @Override+ protected void onSave(AjaxRequestTarget target) {+ modal.close();+ target.add(JobParamListEditPanel.this);+ }++ };+ }++ };+ link.add(new Label("label", rowModel.getObject().getName()));+ fragment.add(link);++ cellItem.add(fragment);+ }+ });++ columns.add(new AbstractColumn<InputSpec, Void>(Model.of("Type")) {++ @Override+ public void populateItem(Item<ICellPopulator<InputSpec>> cellItem, String componentId, IModel<InputSpec> rowModel) {+ cellItem.add(new Label(componentId, EditableUtils.getDisplayName(rowModel.getObject().getClass())));+ }+ });++ columns.add(new AbstractColumn<InputSpec, Void>(Model.of("Allow Empty")) {++ @Override+ public void populateItem(Item<ICellPopulator<InputSpec>> cellItem, String componentId, IModel<InputSpec> rowModel) {+ cellItem.add(new Label(componentId, StringUtils.describe(rowModel.getObject().isAllowEmpty())));+ }++ });++ columns.add(new AbstractColumn<InputSpec, Void>(Model.of("")) {++ @Override+ public void populateItem(Item<ICellPopulator<InputSpec>> cellItem, String componentId, IModel<InputSpec> rowModel) {+ Fragment fragment = new Fragment(componentId, "actionColumnFrag", JobParamListEditPanel.this);+ fragment.add(new AjaxLink<Void>("delete") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ params.remove(rowModel.getObject());+ target.add(JobParamListEditPanel.this);+ }++ });+ cellItem.add(fragment);+ }++ @Override+ public String getCssClass() {+ return "actions";+ }++ });++ IDataProvider<InputSpec> dataProvider = new ListDataProvider<InputSpec>() {++ @Override+ protected List<InputSpec> getData() {+ return params;+ }++ };++ DataTable<InputSpec, Void> dataTable;+ add(dataTable = new DataTable<InputSpec, Void>("params", columns, dataProvider, Integer.MAX_VALUE));+ dataTable.addTopToolbar(new HeadersToolbar<Void>(dataTable, null));+ dataTable.addBottomToolbar(new NoRecordsToolbar(dataTable));++ dataTable.add(new SortBehavior() {++ @Override+ protected void onSort(AjaxRequestTarget target, SortPosition from, SortPosition to) {+ int fromIndex = from.getItemIndex();+ int toIndex = to.getItemIndex();+ if (fromIndex < toIndex) {+ for (int i=0; i<toIndex-fromIndex; i++)+ Collections.swap(params, fromIndex+i, fromIndex+i+1);+ } else {+ for (int i=0; i<fromIndex-toIndex; i++)+ Collections.swap(params, fromIndex-i, fromIndex-i-1);+ }+ target.add(JobParamListEditPanel.this);+ }++ }.sortable("tbody"));++ setOutputMarkupId(true);+ }++ @Override+ protected String getErrorClass() {+ return null;+ }++ @Override+ public void onEvent(IEvent<?> event) {+ super.onEvent(event);++ if (event.getPayload() instanceof PropertyUpdating) {+ event.stop();+ onPropertyUpdating(((PropertyUpdating)event.getPayload()).getHandler());+ }+ }++ @Override+ protected List<Serializable> convertInputToValue() throws ConversionException {+ List<Serializable> value = new ArrayList<>();+ for (InputSpec each: params)+ value.add(each);+ return value;+ }++ @Override+ public ErrorContext getErrorContext(PathSegment pathSegment) {+ return null;+ }++}diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/jobparams/JobParamListEditSupport.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/jobparams/JobParamListEditSupport.javanew file mode 100644index 0000000000..88302b2f7c--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/jobparams/JobParamListEditSupport.java@@ -0,0 +1,61 @@+package io.onedev.server.web.page.project.blob.render.renderers.buildspec.jobparams;++import java.io.Serializable;+import java.util.List;++import org.apache.wicket.Component;+import org.apache.wicket.model.IModel;++import io.onedev.server.build.JobSpec;+import io.onedev.server.util.inputspec.InputSpec;+import io.onedev.server.web.editable.EditSupport;+import io.onedev.server.web.editable.EditableUtils;+import io.onedev.server.web.editable.EmptyValueLabel;+import io.onedev.server.web.editable.PropertyContext;+import io.onedev.server.web.editable.PropertyDescriptor;+import io.onedev.server.web.editable.PropertyEditor;+import io.onedev.server.web.editable.PropertyViewer;++@SuppressWarnings("serial")+public class JobParamListEditSupport implements EditSupport {++ @Override+ public PropertyContext<?> getEditContext(PropertyDescriptor descriptor) {+ if (descriptor.getBeanClass() == JobSpec.class && List.class.isAssignableFrom(descriptor.getPropertyClass())) {+ final Class<?> elementClass = EditableUtils.getElementClass(descriptor.getPropertyGetter().getGenericReturnType());+ if (elementClass == InputSpec.class) {+ return new PropertyContext<List<Serializable>>(descriptor) {++ @Override+ public PropertyViewer renderForView(String componentId, final IModel<List<Serializable>> model) {+ return new PropertyViewer(componentId, descriptor) {++ @Override+ protected Component newContent(String id, PropertyDescriptor propertyDescriptor) {+ if (model.getObject() != null) {+ return new JobParamListViewPanel(id, elementClass, model.getObject());+ } else {+ return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());+ }+ }++ };+ }++ @Override+ public PropertyEditor<List<Serializable>> renderForEdit(String componentId, IModel<List<Serializable>> model) {+ return new JobParamListEditPanel(componentId, descriptor, model);+ }++ };+ }+ }+ return null;+ }++ @Override+ public int getPriority() {+ return 0;+ }++}diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/jobparams/JobParamListViewPanel.html b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/jobparams/JobParamListViewPanel.htmlnew file mode 100644index 0000000000..0f8b5c5b9b--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/jobparams/JobParamListViewPanel.html@@ -0,0 +1,10 @@+<wicket:panel>+ <div class="def-list job-param-list">+ <div class="body">+ <table wicket:id="params" class="table table-condensed table-hover"></table>+ </div>+ </div>+ <wicket:fragment wicket:id="columnFrag">+ <a wicket:id="link"><span wicket:id="label"></span></a>+ </wicket:fragment>+</wicket:panel>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/jobparams/JobParamListViewPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/jobparams/JobParamListViewPanel.javanew file mode 100644index 0000000000..7eb2defde7--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/jobparams/JobParamListViewPanel.java@@ -0,0 +1,173 @@+package io.onedev.server.web.page.project.blob.render.renderers.buildspec.jobparams;++import java.io.Serializable;+import java.util.ArrayList;+import java.util.List;++import org.apache.wicket.Component;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.markup.html.AjaxLink;+import org.apache.wicket.behavior.AttributeAppender;+import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;+import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;+import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;+import org.apache.wicket.extensions.markup.html.repeater.data.table.HeadersToolbar;+import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;+import org.apache.wicket.extensions.markup.html.repeater.data.table.NoRecordsToolbar;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.panel.Fragment;+import org.apache.wicket.markup.html.panel.Panel;+import org.apache.wicket.markup.repeater.Item;+import org.apache.wicket.markup.repeater.data.IDataProvider;+import org.apache.wicket.markup.repeater.data.ListDataProvider;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.Model;++import com.google.common.base.Preconditions;++import io.onedev.server.util.inputspec.InputSpec;+import io.onedev.server.web.editable.BeanContext;+import io.onedev.server.web.editable.EditableUtils;+import io.onedev.server.web.page.layout.SideFloating;+import io.onedev.utils.StringUtils;+import jersey.repackaged.com.google.common.collect.Sets;++@SuppressWarnings("serial")+public class JobParamListViewPanel extends Panel {++ private final List<InputSpec> params = new ArrayList<>();++ public JobParamListViewPanel(String id, Class<?> elementClass, List<Serializable> elements) {+ super(id);++ for (Serializable each: elements)+ params.add((InputSpec) each);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ List<IColumn<InputSpec, Void>> columns = new ArrayList<>();++ columns.add(new AbstractColumn<InputSpec, Void>(Model.of("Name")) {++ @Override+ public void populateItem(Item<ICellPopulator<InputSpec>> cellItem, String componentId, IModel<InputSpec> rowModel) {+ cellItem.add(new ColumnFragment(componentId, rowModel, rowModel.getObject().getName()));+ }+ });++ columns.add(new AbstractColumn<InputSpec, Void>(Model.of("Type")) {++ @Override+ public void populateItem(Item<ICellPopulator<InputSpec>> cellItem, String componentId, IModel<InputSpec> rowModel) {+ InputSpec param = rowModel.getObject();+ cellItem.add(new ColumnFragment(componentId, rowModel, EditableUtils.getDisplayName(param.getClass())));+ }+ });++ columns.add(new AbstractColumn<InputSpec, Void>(Model.of("Allow Empty")) {++ @Override+ public void populateItem(Item<ICellPopulator<InputSpec>> cellItem, String componentId, IModel<InputSpec> rowModel) {+ InputSpec param = rowModel.getObject();+ cellItem.add(new ColumnFragment(componentId, rowModel, StringUtils.describe(param.isAllowEmpty())));+ }+ });++ columns.add(new AbstractColumn<InputSpec, Void>(Model.of("")) {++ @Override+ public void populateItem(Item<ICellPopulator<InputSpec>> cellItem, String componentId, IModel<InputSpec> rowModel) {+ cellItem.add(new Label(componentId, "<a title='Click the row for more info'><i class='fa fa-ellipsis-h'></i></a>").setEscapeModelStrings(false));+ }++ @Override+ public String getCssClass() {+ return "ellipsis";+ }++ });++ IDataProvider<InputSpec> dataProvider = new ListDataProvider<InputSpec>() {++ @Override+ protected List<InputSpec> getData() {+ return params;+ }++ };++ add(new DataTable<InputSpec, Void>("params", columns, dataProvider, Integer.MAX_VALUE) {++ @Override+ protected void onInitialize() {+ super.onInitialize();+ addTopToolbar(new HeadersToolbar<Void>(this, null));+ addBottomToolbar(new NoRecordsToolbar(this));+ }++ });+ }++ private int getParamIndex(String paramName) {+ for (int i=0; i<params.size(); i++) {+ if (params.get(i).getName().equals(paramName))+ return i;+ }+ return -1;+ }++ private class ColumnFragment extends Fragment {++ private final int index;++ private final String label;++ public ColumnFragment(String id, IModel<InputSpec> model, String label) {+ super(id, "columnFrag", JobParamListViewPanel.this, model);+ this.index = getParamIndex(getParam().getName());+ Preconditions.checkState(this.index != -1);+ this.label = label;+ }++ private InputSpec getParam() {+ return (InputSpec) getDefaultModelObject();+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();+ AjaxLink<Void> link = new AjaxLink<Void>("link") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ new SideFloating(target, SideFloating.Placement.RIGHT) {++ @Override+ protected String getTitle() {+ return getParam().getName() + " (type: " + EditableUtils.getDisplayName(getParam().getClass()) + ")";+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();+ add(AttributeAppender.append("class", "job-param def-detail"));+ }++ @Override+ protected Component newBody(String id) {+ return BeanContext.viewBean(id, getParam(), Sets.newHashSet("name"), true);+ }++ };+ }++ };+ link.add(new Label("label", label));+ add(link);+ }++ }+}