[JENKINS-19316] added support for text parameters rendered via textareas

jenkinsci · May 24, 2014 · 1388c44 · 1388c44
1 parent 0349984
commit 1388c44
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 1 deletion.
diff --git a/src/main/java/org/jenkinsci/plugins/buildwithparameters/BuildParameter.java b/src/main/java/org/jenkinsci/plugins/buildwithparameters/BuildParameter.java
@@ -4,6 +4,7 @@
 import hudson.model.BooleanParameterValue;
 import hudson.model.PasswordParameterValue;
 import hudson.model.StringParameterValue;
+import hudson.model.TextParameterValue;
 
 public class BuildParameter {
 
@@ -38,6 +39,8 @@ public String getValue() {
     public void setValue(ParameterValue parameterValue) {
         if (parameterValue instanceof StringParameterValue) {
             this.value = ((StringParameterValue) parameterValue).value;
+        } else if (parameterValue instanceof TextParameterValue) {
+            this.value = ((TextParameterValue) parameterValue).value;
         } else if (parameterValue instanceof BooleanParameterValue) {
             this.value = String.valueOf(((BooleanParameterValue) parameterValue).value);
         } else if (parameterValue instanceof PasswordParameterValue) {

diff --git a/src/main/java/org/jenkinsci/plugins/buildwithparameters/BuildWithParametersAction.java b/src/main/java/org/jenkinsci/plugins/buildwithparameters/BuildWithParametersAction.java
@@ -12,6 +12,8 @@
 import hudson.model.ParametersDefinitionProperty;
 import hudson.model.PasswordParameterDefinition;
 import hudson.model.PasswordParameterValue;
+import hudson.model.StringParameterDefinition;
+import hudson.model.TextParameterDefinition;
 import hudson.util.Secret;
 import java.io.IOException;
 import java.util.ArrayList;
@@ -48,7 +50,12 @@ public List<BuildParameter> getAvailableParameters() {
                 buildParameter.setType(BuildParameterType.PASSWORD);
             } else if (parameterDefinition.getClass().isAssignableFrom(BooleanParameterDefinition.class)) {
                 buildParameter.setType(BuildParameterType.BOOLEAN);
+            } else if (parameterDefinition.getClass().isAssignableFrom(StringParameterDefinition.class)) {
+                buildParameter.setType(BuildParameterType.STRING);
+            } else if (parameterDefinition.getClass().isAssignableFrom(TextParameterDefinition.class)) {
+                buildParameter.setType(BuildParameterType.TEXT);
             } else {
+                // default to string
                 buildParameter.setType(BuildParameterType.STRING);
             }
 

diff --git a/...resources/org/jenkinsci/plugins/buildwithparameters/BuildWithParametersAction/index.jelly b/...resources/org/jenkinsci/plugins/buildwithparameters/BuildWithParametersAction/index.jelly
@@ -17,7 +17,10 @@
                                     <f:password name="${parameter.name}" value="${parameter.value}"/>
                                 </j:when>
                                 <j:when test="${parameter.type == 'BOOLEAN'}">
-                                    <f:checkbox name="value" checked="${parameter.value}" />
+                                    <f:checkbox name="${parameter.name}" checked="${parameter.value}" />
+                                </j:when>
+                                <j:when test="${parameter.type == 'TEXT'}">
+                                    <f:textarea name="${parameter.name}" value="${parameter.value}"/>
                                 </j:when>
                                 <j:otherwise>
                                     <f:textbox name="${parameter.name}" value="${parameter.value}"/>