Merge pull request #7 from lrobertson39/master

Fix regressions in recent release
jenkinsci · May 19, 2014 · 19dac72 · 19dac72
2 parents 8d35518 + a790bef
commit 19dac72
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/...cwctravel/hudson/plugins/extended_choice_parameter/ExtendedChoiceParameterDefinition.java b/...cwctravel/hudson/plugins/extended_choice_parameter/ExtendedChoiceParameterDefinition.java
@@ -151,7 +151,7 @@ public ExtendedChoiceParameterDefinition newInstance(StaplerRequest req, JSONObj
 			type = formData.getString("type");
 			description = formData.getString("description");
 			quoteValue = formData.getBoolean("quoteValue");
-			visibleItemCount = formData.getInt("visibleItemCount");
+			visibleItemCount = formData.optInt("visibleItemCount");
 			multiSelectDelimiter = formData.getString("multiSelectDelimiter");
 
 			JSONObject propertySourceJSON = (JSONObject)formData.get("propertySource");

diff --git a/...l/hudson/plugins/extended_choice_parameter/ExtendedChoiceParameterDefinition/config.jelly b/...l/hudson/plugins/extended_choice_parameter/ExtendedChoiceParameterDefinition/config.jelly
@@ -90,7 +90,7 @@
 		  <f:section title="Choose Source for Value">
 			  <f:radioBlock name="propertySource" title="Value" value="0" checked="${not empty instance.value}">
 				  <f:entry title="Value" field="propertyValue">
-				    <f:textbox />
+				    <f:textbox value="${instance.value}"/>
 				  </f:entry>
 			  </f:radioBlock>