[FIXED JENKINS-25455] Show StringScriptSource by default and thus avo…

…id zero height of the textarea
jenkinsci · Nov 8, 2014 · f91e219 · f91e219
1 parent 3d18cd9
commit f91e219
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/main/resources/hudson/plugins/groovy/Groovy/config.jelly b/src/main/resources/hudson/plugins/groovy/Groovy/config.jelly
@@ -13,8 +13,9 @@
     </f:entry>
 
     <f:entry>
-        <g:multi-hetero-radio field="scriptSource" descriptors="${descriptor.scriptSources}"
-                              id="${descriptor.nextInstanceID()}"/>
+        <g:multi-hetero-radio field="scriptSource" descriptors="${descriptor.scriptSources}" 
+                              id="${descriptor.nextInstanceID()}"
+                              defaultDescriptor="${app.getDescriptorByName('StringScriptSource')}"/>
     </f:entry>
 
     <f:advanced>

diff --git a/src/main/resources/hudson/plugins/groovy/form/multi-hetero-radio.jelly b/src/main/resources/hudson/plugins/groovy/form/multi-hetero-radio.jelly
@@ -38,13 +38,16 @@ THE SOFTWARE.
         <st:attribute name="id" use="required">
             Id of the radioBlock group.
         </st:attribute>
+        <st:attribute name="defaultDescriptor">
+            Default option to be used.
+        </st:attribute>
     </st:documentation>
 
     <f:prepareDatabinding/>
 
     <table style="width:100%">
         <j:set var="currentInstance" value="${instance[field]}"/>
-        <j:set var="currentDescriptor" value="${currentInstance.descriptor}"/>
+        <j:set var="currentDescriptor" value="${currentInstance.descriptor != null ? currentInstance.descriptor : defaultDescriptor}"/>
         <j:forEach var="d" items="${descriptors}" varStatus="loop">
             <f:radioBlock name="${id}.${field}" help="${d.helpFile}" value="${loop.index}"
                           title="${d.displayName}" checked="${currentDescriptor==d}">