[FIXED JENKINS-17660] for convenience, allow usage of ‘value’ for cal…

…ls of label parameters via script
jenkinsci · Dec 30, 2013 · e4aefbf · e4aefbf
1 parent 490e77d
commit e4aefbf
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/src/main/java/org/jvnet/jenkins/plugins/nodelabelparameter/LabelParameterDefinition.java b/src/main/java/org/jvnet/jenkins/plugins/nodelabelparameter/LabelParameterDefinition.java
@@ -3,12 +3,17 @@
  */
 package org.jvnet.jenkins.plugins.nodelabelparameter;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import hudson.Extension;
 import hudson.model.ParameterValue;
 import hudson.model.SimpleParameterDefinition;
 import hudson.model.ParameterDefinition;
+import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
 
+import org.apache.commons.lang.StringUtils;
 import org.kohsuke.stapler.DataBoundConstructor;
 import org.kohsuke.stapler.StaplerRequest;
 
@@ -62,9 +67,14 @@ public String getHelpFile() {
 	public ParameterValue createValue(StaplerRequest req, JSONObject jo) {
 		LabelParameterValue value = req.bindJSON(LabelParameterValue.class, jo);
 		value.setDescription(getDescription());
+		// JENKINS-17660 for convenience, many users use 'value' instead of label - so we make a smal hack to allow this too 
+		if(StringUtils.isBlank(value.getLabel())) {
+		    final String label = jo.optString("value");
+		    value.setLabel(label);
+		}
 		return value;
 	}
-
+	
 	@Override
 	public ParameterValue createValue(String value) {
 		return new LabelParameterValue(getName(), getDescription(), value);