The Unified and Autonomous Development Platform
Fix some minor bugs
Robin Shen3080151ca9cb
diff --git a/core/src/main/java/io/onedev/server/ci/job/DefaultJobScheduler.java b/core/src/main/java/io/onedev/server/ci/job/DefaultJobScheduler.javaindex 85a07b8700..514b4ff3fa 100644--- a/core/src/main/java/io/onedev/server/ci/job/DefaultJobScheduler.java+++ b/core/src/main/java/io/onedev/server/ci/job/DefaultJobScheduler.java@@ -21,6 +21,7 @@ import javax.inject.Inject;import javax.inject.Singleton;import javax.validation.ValidationException;+import org.apache.commons.lang3.StringUtils;import org.eclipse.jgit.lib.ObjectId;import org.quartz.CronScheduleBuilder;import org.quartz.ScheduleBuilder;@@ -314,8 +315,10 @@ public class DefaultJobScheduler implements JobScheduler, Runnable, SchedulableTenvVars.put("ONEDEV_COMMIT", commitId.name());envVars.put("ONEDEV_JOB", job.getName());envVars.put("ONEDEV_BUILD_NUMBER", String.valueOf(build.getNumber()));- for (BuildParam param: build.getParams())- envVars.put("ONEDEV_PARAM_" + param.getName().toUpperCase(), param.getValue());+ for (BuildParam param: build.getParams()) {+ if (StringUtils.isNotBlank(param.getValue()))+ envVars.put(param.getName(), param.getValue());+ }for (JobOutcome outcome: job.getOutcomes()) {PatternSet patternSet = PatternSet.fromString(outcome.getFilePatterns());diff --git a/core/src/main/java/io/onedev/server/model/support/jobexecutor/ServerDockerExecutor.java b/core/src/main/java/io/onedev/server/model/support/jobexecutor/ServerDockerExecutor.javaindex 268c87839a..195ab8004f 100644--- a/core/src/main/java/io/onedev/server/model/support/jobexecutor/ServerDockerExecutor.java+++ b/core/src/main/java/io/onedev/server/model/support/jobexecutor/ServerDockerExecutor.java@@ -232,10 +232,8 @@ public class ServerDockerExecutor extends JobExecutor implements Testable<TestDacmd.clearArgs();String jobInstance = UUID.randomUUID().toString();cmd.addArgs("run", "--rm", "--name", jobInstance);- for (Map.Entry<String, String> entry: envVars.entrySet()) {- if (StringUtils.isNotBlank(entry.getValue()))- cmd.addArgs("--env", entry.getKey() + "=" + entry.getValue());- }+ for (Map.Entry<String, String> entry: envVars.entrySet())+ cmd.addArgs("--env", entry.getKey() + "=" + entry.getValue());if (getRunOptions() != null)cmd.addArgs(StringUtils.parseQuoteTokens(getRunOptions()));diff --git a/core/src/main/java/io/onedev/server/util/inputspec/InputSpec.java b/core/src/main/java/io/onedev/server/util/inputspec/InputSpec.javaindex 1c9c2993a7..9a62eb2379 100644--- a/core/src/main/java/io/onedev/server/util/inputspec/InputSpec.java+++ b/core/src/main/java/io/onedev/server/util/inputspec/InputSpec.java@@ -43,7 +43,7 @@ public abstract class InputSpec implements Serializable {public static final String DATE = "Date";- public static final String PASSWORD = "Password";+ public static final String SECRET = "Secret";public static final String NUMBER = "Number";diff --git a/core/src/main/java/io/onedev/server/util/inputspec/passwordinput/PasswordInput.java b/core/src/main/java/io/onedev/server/util/inputspec/secretinput/SecretInput.javasimilarity index 87%rename from core/src/main/java/io/onedev/server/util/inputspec/passwordinput/PasswordInput.javarename to core/src/main/java/io/onedev/server/util/inputspec/secretinput/SecretInput.javaindex 8f90622786..b15c8737fe 100644--- a/core/src/main/java/io/onedev/server/util/inputspec/passwordinput/PasswordInput.java+++ b/core/src/main/java/io/onedev/server/util/inputspec/secretinput/SecretInput.java@@ -1,4 +1,4 @@-package io.onedev.server.util.inputspec.passwordinput;+package io.onedev.server.util.inputspec.secretinput;import java.util.ArrayList;import java.util.List;@@ -7,13 +7,13 @@ import java.util.Map;import javax.validation.ValidationException;import io.onedev.server.util.inputspec.InputSpec;-import io.onedev.server.util.inputspec.passwordinput.defaultvalueprovider.DefaultValueProvider;+import io.onedev.server.util.inputspec.secretinput.defaultvalueprovider.DefaultValueProvider;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.NameOfEmptyValue;import jersey.repackaged.com.google.common.collect.Lists;-@Editable(order=500, name=InputSpec.PASSWORD)-public class PasswordInput extends InputSpec {+@Editable(order=500, name=InputSpec.SECRET)+public class SecretInput extends InputSpec {private static final long serialVersionUID = 1L;diff --git a/core/src/main/java/io/onedev/server/util/inputspec/passwordinput/defaultvalueprovider/DefaultValueProvider.java b/core/src/main/java/io/onedev/server/util/inputspec/secretinput/defaultvalueprovider/DefaultValueProvider.javasimilarity index 71%rename from core/src/main/java/io/onedev/server/util/inputspec/passwordinput/defaultvalueprovider/DefaultValueProvider.javarename to core/src/main/java/io/onedev/server/util/inputspec/secretinput/defaultvalueprovider/DefaultValueProvider.javaindex f72765011d..86f768de37 100644--- a/core/src/main/java/io/onedev/server/util/inputspec/passwordinput/defaultvalueprovider/DefaultValueProvider.java+++ b/core/src/main/java/io/onedev/server/util/inputspec/secretinput/defaultvalueprovider/DefaultValueProvider.java@@ -1,4 +1,4 @@-package io.onedev.server.util.inputspec.passwordinput.defaultvalueprovider;+package io.onedev.server.util.inputspec.secretinput.defaultvalueprovider;import java.io.Serializable;diff --git a/core/src/main/java/io/onedev/server/util/inputspec/passwordinput/defaultvalueprovider/ScriptingDefaultValue.java b/core/src/main/java/io/onedev/server/util/inputspec/secretinput/defaultvalueprovider/ScriptingDefaultValue.javasimilarity index 92%rename from core/src/main/java/io/onedev/server/util/inputspec/passwordinput/defaultvalueprovider/ScriptingDefaultValue.javarename to core/src/main/java/io/onedev/server/util/inputspec/secretinput/defaultvalueprovider/ScriptingDefaultValue.javaindex 9399ca5936..58faf7c835 100644--- a/core/src/main/java/io/onedev/server/util/inputspec/passwordinput/defaultvalueprovider/ScriptingDefaultValue.java+++ b/core/src/main/java/io/onedev/server/util/inputspec/secretinput/defaultvalueprovider/ScriptingDefaultValue.java@@ -1,4 +1,4 @@-package io.onedev.server.util.inputspec.passwordinput.defaultvalueprovider;+package io.onedev.server.util.inputspec.secretinput.defaultvalueprovider;import org.hibernate.validator.constraints.NotEmpty;diff --git a/core/src/main/java/io/onedev/server/util/inputspec/passwordinput/defaultvalueprovider/SpecifiedDefaultValue.java b/core/src/main/java/io/onedev/server/util/inputspec/secretinput/defaultvalueprovider/SpecifiedDefaultValue.javasimilarity index 90%rename from core/src/main/java/io/onedev/server/util/inputspec/passwordinput/defaultvalueprovider/SpecifiedDefaultValue.javarename to core/src/main/java/io/onedev/server/util/inputspec/secretinput/defaultvalueprovider/SpecifiedDefaultValue.javaindex c4c1402232..9e2c6ddd74 100644--- a/core/src/main/java/io/onedev/server/util/inputspec/passwordinput/defaultvalueprovider/SpecifiedDefaultValue.java+++ b/core/src/main/java/io/onedev/server/util/inputspec/secretinput/defaultvalueprovider/SpecifiedDefaultValue.java@@ -1,4 +1,4 @@-package io.onedev.server.util.inputspec.passwordinput.defaultvalueprovider;+package io.onedev.server.util.inputspec.secretinput.defaultvalueprovider;import org.hibernate.validator.constraints.NotEmpty;diff --git a/core/src/main/java/io/onedev/server/web/ajaxlistener/ChangeTextListener.java b/core/src/main/java/io/onedev/server/web/ajaxlistener/ChangeTextListener.javaindex 7f19cfd9a9..916cc8729f 100644--- a/core/src/main/java/io/onedev/server/web/ajaxlistener/ChangeTextListener.java+++ b/core/src/main/java/io/onedev/server/web/ajaxlistener/ChangeTextListener.java@@ -46,10 +46,14 @@ public class ChangeTextListener implements IAjaxCallListener {@Overridepublic CharSequence getSuccessHandler(Component component) {+ /*+ * Should check empty of prev data as the component itself might be re-rendered to lose+ * previously saved data+ */return String.format(""+ "var $element = $('#%s');"- + "$element.val($element.data('prevValue'));"- + "$element.html($element.data('prevHtml'));",+ + "if ($element.data('prevValue')) $element.val($element.data('prevValue'));"+ + "if ($element.data('prevHtml')) $element.html($element.data('prevHtml'));",component.getMarkupId(true));}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 c503e91489..76977c703a 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@@ -227,6 +227,7 @@ public class BeanEditor extends ValueEditor<Serializable> {@Overrideprotected void onConfigure() {super.onConfigure();+ property.getDescriptor().getDependencyPropertyNames().clear();setVisible(!property.getDescriptor().isPropertyExcluded()&& property.getDescriptor().isPropertyVisible(new OneContext(this), descriptor));}diff --git a/core/src/main/java/io/onedev/server/web/editable/choice/MultiChoiceEditor.java b/core/src/main/java/io/onedev/server/web/editable/choice/MultiChoiceEditor.javaindex fc75b127b1..1c808de23e 100644--- a/core/src/main/java/io/onedev/server/web/editable/choice/MultiChoiceEditor.java+++ b/core/src/main/java/io/onedev/server/web/editable/choice/MultiChoiceEditor.java@@ -54,7 +54,6 @@ public class MultiChoiceEditor extends PropertyEditor<List<String>> {OneContext.push(oneContext);try {- getDescriptor().getDependencyPropertyNames().clear();io.onedev.server.web.editable.annotation.ChoiceProvider choiceProvider =descriptor.getPropertyGetter().getAnnotation(io.onedev.server.web.editable.annotation.ChoiceProvider.class);diff --git a/core/src/main/java/io/onedev/server/web/editable/choice/SingleChoiceEditor.java b/core/src/main/java/io/onedev/server/web/editable/choice/SingleChoiceEditor.javaindex 8551f922dd..d18f6a9064 100644--- a/core/src/main/java/io/onedev/server/web/editable/choice/SingleChoiceEditor.java+++ b/core/src/main/java/io/onedev/server/web/editable/choice/SingleChoiceEditor.java@@ -46,7 +46,6 @@ public class SingleChoiceEditor extends PropertyEditor<String> {OneContext.push(oneContext);try {- getDescriptor().getDependencyPropertyNames().clear();io.onedev.server.web.editable.annotation.ChoiceProvider choiceProvider =descriptor.getPropertyGetter().getAnnotation(io.onedev.server.web.editable.annotation.ChoiceProvider.class);diff --git a/core/src/main/java/io/onedev/server/web/page/project/issueworkflowreconcile/UndefinedFieldResolution.java b/core/src/main/java/io/onedev/server/web/page/project/issueworkflowreconcile/UndefinedFieldResolution.javaindex 9aa8f306ff..9bfc1119e0 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issueworkflowreconcile/UndefinedFieldResolution.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issueworkflowreconcile/UndefinedFieldResolution.java@@ -41,7 +41,7 @@ public class UndefinedFieldResolution implements Serializable {this.fixType = fixType;}- @Editable(order=100, name="Change to Field")+ @Editable(order=100, name="new field")@ChoiceProvider("getFieldChoices")@ShowCondition("isNewFieldVisible")@NotEmptydiff --git a/core/src/main/java/io/onedev/server/web/page/project/issueworkflowreconcile/WorkflowReconcilePanel.java b/core/src/main/java/io/onedev/server/web/page/project/issueworkflowreconcile/WorkflowReconcilePanel.javaindex 0dda0a01f7..9edccbf115 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issueworkflowreconcile/WorkflowReconcilePanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issueworkflowreconcile/WorkflowReconcilePanel.java@@ -213,7 +213,6 @@ public abstract class WorkflowReconcilePanel extends Panel {@Overrideprotected void onSubmit(AjaxRequestTarget target, Form<?> form) {super.onSubmit(target, form);-getIssueManager().fixUndefinedFields(resolutions);Component content = checkFieldValues(CONTENT_ID);