The Unified and Autonomous Development Platform
Fix some cispec edit bugs
Robin Shen882b544ead21
diff --git a/core/src/main/java/io/onedev/server/ci/Dependency.java b/core/src/main/java/io/onedev/server/ci/Dependency.javaindex 8323ab3da9..68a9213238 100644--- a/core/src/main/java/io/onedev/server/ci/Dependency.java+++ b/core/src/main/java/io/onedev/server/ci/Dependency.java@@ -19,7 +19,7 @@ import io.onedev.server.util.validation.Validatable;import io.onedev.server.util.validation.annotation.ClassValidating;import io.onedev.server.web.editable.annotation.ChoiceProvider;import io.onedev.server.web.editable.annotation.Editable;-import io.onedev.server.web.page.project.blob.render.renderers.cispec.dependency.DependencyEditPanel;+import io.onedev.server.web.page.project.blob.render.renderers.cispec.job.dependency.DependencyEditPanel;@Editable@ClassValidating@@ -58,7 +58,8 @@ public class Dependency implements Serializable, Validatable {List<String> choices = new ArrayList<>();Job belongingJob = editor.getBelongingJob();for (Job job: editor.getEditingCISpec().getJobs()) {- choices.add(job.getName());+ if (job.getName() != null)+ choices.add(job.getName());}choices.remove(belongingJob.getName());return choices;diff --git a/core/src/main/java/io/onedev/server/ci/job/Job.java b/core/src/main/java/io/onedev/server/ci/job/Job.javaindex cf0243c079..b40e90edd3 100644--- a/core/src/main/java/io/onedev/server/ci/job/Job.java+++ b/core/src/main/java/io/onedev/server/ci/job/Job.java@@ -33,20 +33,20 @@ public class Job implements Serializable, Validatable {private String name;+ private List<InputSpec> paramSpecs = new ArrayList<>();+private String environment;private List<String> commands;private boolean cloneSource = true;- private List<JobOutcome> outcomes = new ArrayList<>();-private List<Dependency> dependencies = new ArrayList<>();+ private List<JobOutcome> outcomes = new ArrayList<>();+private List<JobTrigger> triggers = new ArrayList<>();- private List<InputSpec> promptParams = new ArrayList<>();-private List<JobCache> caches = new ArrayList<>();private long timeout = 3600;@@ -63,6 +63,15 @@ public class Job implements Serializable, Validatable {this.name = name;}+ @Editable(order=105, name="Parameter Specifications", description="Define parameter specifications of the job")+ public List<InputSpec> getParamSpecs() {+ return paramSpecs;+ }++ public void setParamSpecs(List<InputSpec> paramSpecs) {+ this.paramSpecs = paramSpecs;+ }+@Editable(order=110, description="Specify the environment to run the command. Environment will be interpretated "+ "by underlying job executor. For instance, a docker executor will treat it as a docker image, and an "+ "agent executor will treat it as labels to match agents")@@ -125,16 +134,6 @@ public class Job implements Serializable, Validatable {this.triggers = triggers;}- @Editable(order=10000, group="More Settings", description="Specify parameters to prompt when the job "- + "is triggered manually")- public List<InputSpec> getPromptParams() {- return promptParams;- }-- public void setPromptParams(List<InputSpec> promptParams) {- this.promptParams = promptParams;- }-@Editable(order=10100, group="More Settings", description="Cache specific paths to speed up job execution. For instance for node.js "+ "projects, you may cache the <tt>node_modules</tt> folder to avoid downloading node modules for "+ "subsequent job executions. Note that cache is considered as a best-effort approach and your "@@ -208,7 +207,7 @@ public class Job implements Serializable, Validatable {}Set<String> promptParamNames = new HashSet<>();- for (InputSpec promptParam: promptParams) {+ for (InputSpec promptParam: paramSpecs) {if (promptParamNames.contains(promptParam.getName())) {isValid = false;context.buildConstraintViolationWithTemplate("Duplicate prompt param: " + promptParam.getName())diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecBlobViewPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecBlobViewPanel.javaindex 68d4f9976e..aeaa9ee444 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecBlobViewPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecBlobViewPanel.java@@ -90,7 +90,7 @@ public class CISpecBlobViewPanel extends BlobViewPanel {super.renderHead(response);response.render(JavaScriptHeaderItem.forReference(new CISpecResourceReference()));String selection = CISpecRendererProvider.getSelection(context.getPosition());- String script = String.format("onedev.ciSpec.onDomReady(%s, %s);",+ String script = String.format("onedev.server.ciSpec.onDomReady(%s, %s);",selection!=null? "'" + JavaScriptEscape.escapeJavaScript(selection) + "'": "undefined",behavior.getCallbackFunction(CallbackParameter.explicit("selection")));response.render(OnDomReadyHeaderItem.forScript(script));diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecEditPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecEditPanel.javaindex 1e30bad393..9b73aed0ce 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecEditPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecEditPanel.java@@ -82,7 +82,7 @@ public class CISpecEditPanel extends FormComponentPanel<byte[]> {int index = WicketUtils.getChildIndex(jobNavs, nav);jobNavs.remove(nav);jobContents.remove(jobContents.get(index));- target.appendJavaScript(String.format("onedev.ciSpec.edit.deleteJob(%d);", index));+ target.appendJavaScript(String.format("onedev.server.ciSpec.edit.deleteJob(%d);", index));}});@@ -101,7 +101,7 @@ public class CISpecEditPanel extends FormComponentPanel<byte[]> {public void renderHead(Component component, IHeaderResponse response) {super.renderHead(component, response);int index = WicketUtils.getChildIndex(jobContents, content);- String script = String.format("onedev.ciSpec.edit.trackJobNameChange(%d);", index);+ String script = String.format("onedev.server.ciSpec.edit.trackJobNameChange(%d);", index);response.render(OnDomReadyHeaderItem.forScript(script));}@@ -147,7 +147,10 @@ public class CISpecEditPanel extends FormComponentPanel<byte[]> {target.prependJavaScript(script);target.add(content);- script = String.format("onedev.ciSpec.showJob(%d);", jobNavs.size() - 1);+ script = String.format(""+ + "onedev.server.ciSpec.showJob(%d); "+ + "$('#%s .select').click(onedev.server.ciSpec.selectJob);",+ jobNavs.size() - 1, nav.getMarkupId());target.appendJavaScript(script);}@@ -171,7 +174,7 @@ public class CISpecEditPanel extends FormComponentPanel<byte[]> {jobContents.swap(fromIndex-i, fromIndex-i-1);}}- target.appendJavaScript(String.format("onedev.ciSpec.edit.swapJobs(%d, %d)", fromIndex, toIndex));+ target.appendJavaScript(String.format("onedev.server.ciSpec.edit.swapJobs(%d, %d)", fromIndex, toIndex));}}.sortable(".jobs>.body>.side>.navs"));@@ -240,7 +243,7 @@ public class CISpecEditPanel extends FormComponentPanel<byte[]> {super.renderHead(response);response.render(JavaScriptHeaderItem.forReference(new CISpecResourceReference()));String selection = CISpecRendererProvider.getSelection(context.getPosition());- String script = String.format("onedev.ciSpec.onDomReady(%s);",+ String script = String.format("onedev.server.ciSpec.onDomReady(%s);",selection!=null? "'" + JavaScriptEscape.escapeJavaScript(selection) + "'": "undefined");response.render(OnDomReadyHeaderItem.forScript(script));}diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/ci-spec.js b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/ci-spec.jsindex af3b82de21..e14a05876d 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/ci-spec.js+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/ci-spec.js@@ -1,7 +1,9 @@-onedev.ciSpec = {+onedev.server.ciSpec = {onDomReady: function(selection, callback) {var activeJobIndex = -1;var $body = $(".ci-spec>.valid>.jobs>.body");+ $body.data("callback", callback);+$body.find(">.contents>.content").each(function() {var $this = $(this);if ($this.find(".feedbackPanelERROR").length != 0) {@@ -18,14 +20,16 @@ onedev.ciSpec = {if (activeJobIndex == -1)activeJobIndex = 0;- onedev.ciSpec.showJob(activeJobIndex);+ onedev.server.ciSpec.showJob(activeJobIndex);- $body.find(".side>.navs>.nav>.select").click(function() {- var $nav = $(this).parent();- onedev.ciSpec.showJob($nav.index());- if (callback)- callback("jobs/" + $nav.data("name"));- });+ $body.find(".side>.navs>.nav>.select").click(onedev.server.ciSpec.selectJob);+ },+ selectJob: function() {+ var $nav = $(this).parent();+ onedev.server.ciSpec.showJob($nav.index());+ var $body = $(".ci-spec>.valid>.jobs>.body");+ if ($body.data("callback"))+ $body.data("callback")("jobs/" + $nav.data("name"));},showJob: function(index) {var $body = $(".ci-spec>.valid>.jobs>.body");@@ -50,7 +54,7 @@ onedev.ciSpec = {$contents.children().eq(index).remove();if ($nav.hasClass("active"))- onedev.ciSpec.showJob(0);+ onedev.server.ciSpec.showJob(0);},swapJobs: function(index1, index2) {var $contents = $(".ci-spec-edit .jobs>.body>.contents");diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependency/DependencyEditPanel.html b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/dependency/DependencyEditPanel.htmlsimilarity index 100%rename from core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependency/DependencyEditPanel.htmlrename to core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/dependency/DependencyEditPanel.htmldiff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependency/DependencyEditPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/dependency/DependencyEditPanel.javasimilarity index 95%rename from core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependency/DependencyEditPanel.javarename to core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/dependency/DependencyEditPanel.javaindex f05a2295b3..ffe0ba197b 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependency/DependencyEditPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/dependency/DependencyEditPanel.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.project.blob.render.renderers.cispec.dependency;+package io.onedev.server.web.page.project.blob.render.renderers.cispec.job.dependency;import java.util.List;diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependency/DependencyListEditPanel.html b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/dependency/DependencyListEditPanel.htmlsimilarity index 100%rename from core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependency/DependencyListEditPanel.htmlrename to core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/dependency/DependencyListEditPanel.htmldiff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependency/DependencyListEditPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/dependency/DependencyListEditPanel.javasimilarity index 94%rename from core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependency/DependencyListEditPanel.javarename to core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/dependency/DependencyListEditPanel.javaindex a5554ee82a..1cea91eb8a 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependency/DependencyListEditPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/dependency/DependencyListEditPanel.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.project.blob.render.renderers.cispec.dependency;+package io.onedev.server.web.page.project.blob.render.renderers.cispec.job.dependency;import java.io.Serializable;import java.util.ArrayList;@@ -70,6 +70,7 @@ public class DependencyListEditPanel extends PropertyEditor<List<Serializable>>@Overrideprotected void onSave(AjaxRequestTarget target) {modal.close();+ onPropertyUpdating(target);target.add(DependencyListEditPanel.this);}@@ -109,6 +110,7 @@ public class DependencyListEditPanel extends PropertyEditor<List<Serializable>>@Overrideprotected void onSave(AjaxRequestTarget target) {modal.close();+ onPropertyUpdating(target);target.add(DependencyListEditPanel.this);}@@ -143,6 +145,7 @@ public class DependencyListEditPanel extends PropertyEditor<List<Serializable>>@Overridepublic void onClick(AjaxRequestTarget target) {dependencies.remove(rowModel.getObject());+ onPropertyUpdating(target);target.add(DependencyListEditPanel.this);}@@ -184,6 +187,7 @@ public class DependencyListEditPanel extends PropertyEditor<List<Serializable>>for (int i=0; i<fromIndex-toIndex; i++)Collections.swap(dependencies, fromIndex-i, fromIndex-i-1);}+ onPropertyUpdating(target);target.add(DependencyListEditPanel.this);}diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependency/DependencyListEditSupport.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/dependency/DependencyListEditSupport.javasimilarity index 96%rename from core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependency/DependencyListEditSupport.javarename to core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/dependency/DependencyListEditSupport.javaindex 76ff3b2408..5b695024e6 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependency/DependencyListEditSupport.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/dependency/DependencyListEditSupport.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.project.blob.render.renderers.cispec.dependency;+package io.onedev.server.web.page.project.blob.render.renderers.cispec.job.dependency;import java.io.Serializable;import java.util.List;diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependency/DependencyListViewPanel.html b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/dependency/DependencyListViewPanel.htmlsimilarity index 100%rename from core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependency/DependencyListViewPanel.htmlrename to core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/dependency/DependencyListViewPanel.htmldiff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependency/DependencyListViewPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/dependency/DependencyListViewPanel.javasimilarity index 96%rename from core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependency/DependencyListViewPanel.javarename to core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/dependency/DependencyListViewPanel.javaindex d51d00bbf0..073b81f9f5 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependency/DependencyListViewPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/dependency/DependencyListViewPanel.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.project.blob.render.renderers.cispec.dependency;+package io.onedev.server.web.page.project.blob.render.renderers.cispec.job.dependency;import java.io.Serializable;import java.util.ArrayList;diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/joboutcome/OutcomeBean.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/outcome/OutcomeBean.javasimilarity index 92%rename from core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/joboutcome/OutcomeBean.javarename to core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/outcome/OutcomeBean.javaindex 511e786563..1b3873b706 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/joboutcome/OutcomeBean.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/outcome/OutcomeBean.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.project.blob.render.renderers.cispec.joboutcome;+package io.onedev.server.web.page.project.blob.render.renderers.cispec.job.outcome;import java.io.Serializable;diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/joboutcome/OutcomeEditPanel.html b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/outcome/OutcomeEditPanel.htmlsimilarity index 100%rename from core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/joboutcome/OutcomeEditPanel.htmlrename to core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/outcome/OutcomeEditPanel.htmldiff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/joboutcome/OutcomeEditPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/outcome/OutcomeEditPanel.javasimilarity index 95%rename from core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/joboutcome/OutcomeEditPanel.javarename to core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/outcome/OutcomeEditPanel.javaindex 8a2a17192d..263e64eee9 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/joboutcome/OutcomeEditPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/outcome/OutcomeEditPanel.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.project.blob.render.renderers.cispec.joboutcome;+package io.onedev.server.web.page.project.blob.render.renderers.cispec.job.outcome;import java.util.List;diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/joboutcome/OutcomeListEditPanel.html b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/outcome/OutcomeListEditPanel.htmlsimilarity index 100%rename from core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/joboutcome/OutcomeListEditPanel.htmlrename to core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/outcome/OutcomeListEditPanel.htmldiff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/joboutcome/OutcomeListEditPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/outcome/OutcomeListEditPanel.javasimilarity index 94%rename from core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/joboutcome/OutcomeListEditPanel.javarename to core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/outcome/OutcomeListEditPanel.javaindex 44f9d34128..8180ea1977 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/joboutcome/OutcomeListEditPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/outcome/OutcomeListEditPanel.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.project.blob.render.renderers.cispec.joboutcome;+package io.onedev.server.web.page.project.blob.render.renderers.cispec.job.outcome;import java.io.Serializable;import java.util.ArrayList;@@ -67,6 +67,7 @@ public class OutcomeListEditPanel extends PropertyEditor<List<Serializable>> {@Overrideprotected void onSave(AjaxRequestTarget target) {modal.close();+ onPropertyUpdating(target);target.add(OutcomeListEditPanel.this);}@@ -96,6 +97,7 @@ public class OutcomeListEditPanel extends PropertyEditor<List<Serializable>> {@Overrideprotected void onSave(AjaxRequestTarget target) {modal.close();+ onPropertyUpdating(target);target.add(OutcomeListEditPanel.this);}@@ -128,6 +130,7 @@ public class OutcomeListEditPanel extends PropertyEditor<List<Serializable>> {@Overridepublic void onClick(AjaxRequestTarget target) {outcomes.remove(rowModel.getObject());+ onPropertyUpdating(target);target.add(OutcomeListEditPanel.this);}@@ -169,6 +172,7 @@ public class OutcomeListEditPanel extends PropertyEditor<List<Serializable>> {for (int i=0; i<fromIndex-toIndex; i++)Collections.swap(outcomes, fromIndex-i, fromIndex-i-1);}+ onPropertyUpdating(target);target.add(OutcomeListEditPanel.this);}diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/joboutcome/OutcomeListEditSupport.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/outcome/OutcomeListEditSupport.javasimilarity index 96%rename from core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/joboutcome/OutcomeListEditSupport.javarename to core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/outcome/OutcomeListEditSupport.javaindex f845e9d486..f3de3d79d5 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/joboutcome/OutcomeListEditSupport.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/outcome/OutcomeListEditSupport.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.project.blob.render.renderers.cispec.joboutcome;+package io.onedev.server.web.page.project.blob.render.renderers.cispec.job.outcome;import java.io.Serializable;import java.util.List;diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/joboutcome/OutcomeListViewPanel.html b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/outcome/OutcomeListViewPanel.htmlsimilarity index 100%rename from core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/joboutcome/OutcomeListViewPanel.htmlrename to core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/outcome/OutcomeListViewPanel.htmldiff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/joboutcome/OutcomeListViewPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/outcome/OutcomeListViewPanel.javasimilarity index 96%rename from core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/joboutcome/OutcomeListViewPanel.javarename to core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/outcome/OutcomeListViewPanel.javaindex f6ff533f63..6414f26bb2 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/joboutcome/OutcomeListViewPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/outcome/OutcomeListViewPanel.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.project.blob.render.renderers.cispec.joboutcome;+package io.onedev.server.web.page.project.blob.render.renderers.cispec.job.outcome;import java.io.Serializable;import java.util.ArrayList;diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparam/ParamBean.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/paramspec/ParamBean.javasimilarity index 92%rename from core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparam/ParamBean.javarename to core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/paramspec/ParamBean.javaindex 62839015aa..30c1b67f1f 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparam/ParamBean.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/paramspec/ParamBean.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.project.blob.render.renderers.cispec.jobparam;+package io.onedev.server.web.page.project.blob.render.renderers.cispec.job.paramspec;import java.io.Serializable;diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparam/ParamEditPanel.html b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/paramspec/ParamEditPanel.htmlsimilarity index 100%rename from core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparam/ParamEditPanel.htmlrename to core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/paramspec/ParamEditPanel.htmldiff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparam/ParamEditPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/paramspec/ParamEditPanel.javasimilarity index 95%rename from core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparam/ParamEditPanel.javarename to core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/paramspec/ParamEditPanel.javaindex 3d89e3c877..65b837bef4 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparam/ParamEditPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/paramspec/ParamEditPanel.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.project.blob.render.renderers.cispec.jobparam;+package io.onedev.server.web.page.project.blob.render.renderers.cispec.job.paramspec;import java.util.ArrayList;import java.util.List;diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparam/ParamEditPanel.properties b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/paramspec/ParamEditPanel.propertiessimilarity index 100%rename from core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparam/ParamEditPanel.propertiesrename to core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/paramspec/ParamEditPanel.propertiesdiff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparam/ParamListEditPanel.html b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/paramspec/ParamListEditPanel.htmlsimilarity index 100%rename from core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparam/ParamListEditPanel.htmlrename to core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/paramspec/ParamListEditPanel.htmldiff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparam/ParamListEditPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/paramspec/ParamListEditPanel.javasimilarity index 94%rename from core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparam/ParamListEditPanel.javarename to core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/paramspec/ParamListEditPanel.javaindex b28a26ccea..bd653d020b 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparam/ParamListEditPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/paramspec/ParamListEditPanel.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.project.blob.render.renderers.cispec.jobparam;+package io.onedev.server.web.page.project.blob.render.renderers.cispec.job.paramspec;import java.io.Serializable;import java.util.ArrayList;@@ -68,6 +68,7 @@ public class ParamListEditPanel extends PropertyEditor<List<Serializable>> {@Overrideprotected void onSave(AjaxRequestTarget target) {modal.close();+ onPropertyUpdating(target);target.add(ParamListEditPanel.this);}@@ -97,6 +98,7 @@ public class ParamListEditPanel extends PropertyEditor<List<Serializable>> {@Overrideprotected void onSave(AjaxRequestTarget target) {modal.close();+ onPropertyUpdating(target);target.add(ParamListEditPanel.this);}@@ -138,6 +140,7 @@ public class ParamListEditPanel extends PropertyEditor<List<Serializable>> {@Overridepublic void onClick(AjaxRequestTarget target) {params.remove(rowModel.getObject());+ onPropertyUpdating(target);target.add(ParamListEditPanel.this);}@@ -179,6 +182,7 @@ public class ParamListEditPanel extends PropertyEditor<List<Serializable>> {for (int i=0; i<fromIndex-toIndex; i++)Collections.swap(params, fromIndex-i, fromIndex-i-1);}+ onPropertyUpdating(target);target.add(ParamListEditPanel.this);}diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparam/ParamListEditSupport.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/paramspec/ParamListEditSupport.javasimilarity index 96%rename from core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparam/ParamListEditSupport.javarename to core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/paramspec/ParamListEditSupport.javaindex 6364dff2c5..cbe6d58eb4 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparam/ParamListEditSupport.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/paramspec/ParamListEditSupport.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.project.blob.render.renderers.cispec.jobparam;+package io.onedev.server.web.page.project.blob.render.renderers.cispec.job.paramspec;import java.io.Serializable;import java.util.List;diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparam/ParamListViewPanel.html b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/paramspec/ParamListViewPanel.htmlsimilarity index 100%rename from core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparam/ParamListViewPanel.htmlrename to core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/paramspec/ParamListViewPanel.htmldiff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparam/ParamListViewPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/paramspec/ParamListViewPanel.javasimilarity index 96%rename from core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparam/ParamListViewPanel.javarename to core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/paramspec/ParamListViewPanel.javaindex 5978fcae22..6a62b09a07 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparam/ParamListViewPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/paramspec/ParamListViewPanel.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.project.blob.render.renderers.cispec.jobparam;+package io.onedev.server.web.page.project.blob.render.renderers.cispec.job.paramspec;import java.io.Serializable;import java.util.ArrayList;diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobtrigger/TriggerBean.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/trigger/TriggerBean.javasimilarity index 92%rename from core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobtrigger/TriggerBean.javarename to core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/trigger/TriggerBean.javaindex 661ab22392..80fb0bd70b 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobtrigger/TriggerBean.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/trigger/TriggerBean.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.project.blob.render.renderers.cispec.jobtrigger;+package io.onedev.server.web.page.project.blob.render.renderers.cispec.job.trigger;import java.io.Serializable;diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobtrigger/TriggerEditPanel.html b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/trigger/TriggerEditPanel.htmlsimilarity index 100%rename from core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobtrigger/TriggerEditPanel.htmlrename to core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/trigger/TriggerEditPanel.htmldiff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobtrigger/TriggerEditPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/trigger/TriggerEditPanel.javasimilarity index 95%rename from core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobtrigger/TriggerEditPanel.javarename to core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/trigger/TriggerEditPanel.javaindex c2c150afc1..9837137ff0 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobtrigger/TriggerEditPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/trigger/TriggerEditPanel.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.project.blob.render.renderers.cispec.jobtrigger;+package io.onedev.server.web.page.project.blob.render.renderers.cispec.job.trigger;import java.util.List;diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobtrigger/TriggerListEditPanel.html b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/trigger/TriggerListEditPanel.htmlsimilarity index 100%rename from core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobtrigger/TriggerListEditPanel.htmlrename to core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/trigger/TriggerListEditPanel.htmldiff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobtrigger/TriggerListEditPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/trigger/TriggerListEditPanel.javasimilarity index 94%rename from core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobtrigger/TriggerListEditPanel.javarename to core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/trigger/TriggerListEditPanel.javaindex 7d2fde4ac3..a53a055099 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobtrigger/TriggerListEditPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/trigger/TriggerListEditPanel.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.project.blob.render.renderers.cispec.jobtrigger;+package io.onedev.server.web.page.project.blob.render.renderers.cispec.job.trigger;import java.io.Serializable;import java.util.ArrayList;@@ -66,6 +66,7 @@ public class TriggerListEditPanel extends PropertyEditor<List<Serializable>> {@Overrideprotected void onSave(AjaxRequestTarget target) {modal.close();+ onPropertyUpdating(target);target.add(TriggerListEditPanel.this);}@@ -95,6 +96,7 @@ public class TriggerListEditPanel extends PropertyEditor<List<Serializable>> {@Overrideprotected void onSave(AjaxRequestTarget target) {modal.close();+ onPropertyUpdating(target);target.add(TriggerListEditPanel.this);}@@ -119,6 +121,7 @@ public class TriggerListEditPanel extends PropertyEditor<List<Serializable>> {@Overridepublic void onClick(AjaxRequestTarget target) {triggers.remove(rowModel.getObject());+ onPropertyUpdating(target);target.add(TriggerListEditPanel.this);}@@ -160,6 +163,7 @@ public class TriggerListEditPanel extends PropertyEditor<List<Serializable>> {for (int i=0; i<fromIndex-toIndex; i++)Collections.swap(triggers, fromIndex-i, fromIndex-i-1);}+ onPropertyUpdating(target);target.add(TriggerListEditPanel.this);}diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobtrigger/TriggerListEditSupport.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/trigger/TriggerListEditSupport.javasimilarity index 96%rename from core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobtrigger/TriggerListEditSupport.javarename to core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/trigger/TriggerListEditSupport.javaindex 4a99b36d03..f722646c93 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobtrigger/TriggerListEditSupport.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/trigger/TriggerListEditSupport.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.project.blob.render.renderers.cispec.jobtrigger;+package io.onedev.server.web.page.project.blob.render.renderers.cispec.job.trigger;import java.io.Serializable;import java.util.List;diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobtrigger/TriggerListViewPanel.html b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/trigger/TriggerListViewPanel.htmlsimilarity index 100%rename from core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobtrigger/TriggerListViewPanel.htmlrename to core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/trigger/TriggerListViewPanel.htmldiff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobtrigger/TriggerListViewPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/trigger/TriggerListViewPanel.javasimilarity index 96%rename from core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobtrigger/TriggerListViewPanel.javarename to core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/trigger/TriggerListViewPanel.javaindex 21fb27b663..e6df76a857 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobtrigger/TriggerListViewPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/trigger/TriggerListViewPanel.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.project.blob.render.renderers.cispec.jobtrigger;+package io.onedev.server.web.page.project.blob.render.renderers.cispec.job.trigger;import java.io.Serializable;import java.util.ArrayList;diff --git a/core/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java b/core/src/main/java/org/apache/wicket/markup/html/form/FormComponent.javaindex 7958ac3f32..87f3fcde38 100644--- a/core/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java+++ b/core/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java@@ -469,6 +469,8 @@ public abstract class FormComponent<T> extends LabeledWebMarkupContainer implemepublic FormComponent(final String id, IModel<T> model){super(id, model);+ if (model != null)+ setConvertedInput(model.getObject());// the form decides whether form components are versioned or not// see Form.setVersionedsetVersioned(false);