Skip to content

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.java
index 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.java
index 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.java
index 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.java
index 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.js
index 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.html
similarity index 100%
rename from core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependency/DependencyEditPanel.html
rename to core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/dependency/DependencyEditPanel.html
diff --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.java
similarity index 95%
rename from core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependency/DependencyEditPanel.java
rename to core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/dependency/DependencyEditPanel.java
index 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.html
similarity index 100%
rename from core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependency/DependencyListEditPanel.html
rename to core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/dependency/DependencyListEditPanel.html
diff --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.java
similarity index 94%
rename from core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependency/DependencyListEditPanel.java
rename to core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/dependency/DependencyListEditPanel.java
index 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>>
@Override
protected void onSave(AjaxRequestTarget target) {
modal.close();
+ onPropertyUpdating(target);
target.add(DependencyListEditPanel.this);
}
@@ -109,6 +110,7 @@ public class DependencyListEditPanel extends PropertyEditor<List<Serializable>>
@Override
protected void onSave(AjaxRequestTarget target) {
modal.close();
+ onPropertyUpdating(target);
target.add(DependencyListEditPanel.this);
}
@@ -143,6 +145,7 @@ public class DependencyListEditPanel extends PropertyEditor<List<Serializable>>
@Override
public 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.java
similarity index 96%
rename from core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependency/DependencyListEditSupport.java
rename to core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/dependency/DependencyListEditSupport.java
index 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.html
similarity index 100%
rename from core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependency/DependencyListViewPanel.html
rename to core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/dependency/DependencyListViewPanel.html
diff --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.java
similarity index 96%
rename from core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependency/DependencyListViewPanel.java
rename to core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/dependency/DependencyListViewPanel.java
index 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.java
similarity index 92%
rename from core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/joboutcome/OutcomeBean.java
rename to core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/outcome/OutcomeBean.java
index 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.html
similarity index 100%
rename from core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/joboutcome/OutcomeEditPanel.html
rename to core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/outcome/OutcomeEditPanel.html
diff --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.java
similarity index 95%
rename from core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/joboutcome/OutcomeEditPanel.java
rename to core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/outcome/OutcomeEditPanel.java
index 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.html
similarity index 100%
rename from core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/joboutcome/OutcomeListEditPanel.html
rename to core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/outcome/OutcomeListEditPanel.html
diff --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.java
similarity index 94%
rename from core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/joboutcome/OutcomeListEditPanel.java
rename to core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/outcome/OutcomeListEditPanel.java
index 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>> {
@Override
protected void onSave(AjaxRequestTarget target) {
modal.close();
+ onPropertyUpdating(target);
target.add(OutcomeListEditPanel.this);
}
@@ -96,6 +97,7 @@ public class OutcomeListEditPanel extends PropertyEditor<List<Serializable>> {
@Override
protected void onSave(AjaxRequestTarget target) {
modal.close();
+ onPropertyUpdating(target);
target.add(OutcomeListEditPanel.this);
}
@@ -128,6 +130,7 @@ public class OutcomeListEditPanel extends PropertyEditor<List<Serializable>> {
@Override
public 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.java
similarity index 96%
rename from core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/joboutcome/OutcomeListEditSupport.java
rename to core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/outcome/OutcomeListEditSupport.java
index 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.html
similarity index 100%
rename from core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/joboutcome/OutcomeListViewPanel.html
rename to core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/outcome/OutcomeListViewPanel.html
diff --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.java
similarity index 96%
rename from core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/joboutcome/OutcomeListViewPanel.java
rename to core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/outcome/OutcomeListViewPanel.java
index 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.java
similarity index 92%
rename from core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparam/ParamBean.java
rename to core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/paramspec/ParamBean.java
index 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.html
similarity index 100%
rename from core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparam/ParamEditPanel.html
rename to core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/paramspec/ParamEditPanel.html
diff --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.java
similarity index 95%
rename from core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparam/ParamEditPanel.java
rename to core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/paramspec/ParamEditPanel.java
index 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.properties
similarity index 100%
rename from core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparam/ParamEditPanel.properties
rename to core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/paramspec/ParamEditPanel.properties
diff --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.html
similarity index 100%
rename from core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparam/ParamListEditPanel.html
rename to core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/paramspec/ParamListEditPanel.html
diff --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.java
similarity index 94%
rename from core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparam/ParamListEditPanel.java
rename to core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/paramspec/ParamListEditPanel.java
index 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>> {
@Override
protected void onSave(AjaxRequestTarget target) {
modal.close();
+ onPropertyUpdating(target);
target.add(ParamListEditPanel.this);
}
@@ -97,6 +98,7 @@ public class ParamListEditPanel extends PropertyEditor<List<Serializable>> {
@Override
protected void onSave(AjaxRequestTarget target) {
modal.close();
+ onPropertyUpdating(target);
target.add(ParamListEditPanel.this);
}
@@ -138,6 +140,7 @@ public class ParamListEditPanel extends PropertyEditor<List<Serializable>> {
@Override
public 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.java
similarity index 96%
rename from core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparam/ParamListEditSupport.java
rename to core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/paramspec/ParamListEditSupport.java
index 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.html
similarity index 100%
rename from core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparam/ParamListViewPanel.html
rename to core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/paramspec/ParamListViewPanel.html
diff --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.java
similarity index 96%
rename from core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparam/ParamListViewPanel.java
rename to core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/paramspec/ParamListViewPanel.java
index 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.java
similarity index 92%
rename from core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobtrigger/TriggerBean.java
rename to core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/trigger/TriggerBean.java
index 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.html
similarity index 100%
rename from core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobtrigger/TriggerEditPanel.html
rename to core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/trigger/TriggerEditPanel.html
diff --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.java
similarity index 95%
rename from core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobtrigger/TriggerEditPanel.java
rename to core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/trigger/TriggerEditPanel.java
index 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.html
similarity index 100%
rename from core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobtrigger/TriggerListEditPanel.html
rename to core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/trigger/TriggerListEditPanel.html
diff --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.java
similarity index 94%
rename from core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobtrigger/TriggerListEditPanel.java
rename to core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/trigger/TriggerListEditPanel.java
index 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>> {
@Override
protected void onSave(AjaxRequestTarget target) {
modal.close();
+ onPropertyUpdating(target);
target.add(TriggerListEditPanel.this);
}
@@ -95,6 +96,7 @@ public class TriggerListEditPanel extends PropertyEditor<List<Serializable>> {
@Override
protected void onSave(AjaxRequestTarget target) {
modal.close();
+ onPropertyUpdating(target);
target.add(TriggerListEditPanel.this);
}
@@ -119,6 +121,7 @@ public class TriggerListEditPanel extends PropertyEditor<List<Serializable>> {
@Override
public 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.java
similarity index 96%
rename from core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobtrigger/TriggerListEditSupport.java
rename to core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/trigger/TriggerListEditSupport.java
index 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.html
similarity index 100%
rename from core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobtrigger/TriggerListViewPanel.html
rename to core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/trigger/TriggerListViewPanel.html
diff --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.java
similarity index 96%
rename from core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobtrigger/TriggerListViewPanel.java
rename to core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/trigger/TriggerListViewPanel.java
index 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.java
index 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 impleme
public 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.setVersioned
setVersioned(false);