Skip to content
Permalink
Browse files
Merge branch 'hetero-radio' of github.com:wolfs/jenkins
[JENKINS-22583] Noting merge of #1182.
Conflicts:
	changelog.html
  • Loading branch information
jglick committed Apr 14, 2014
2 parents 5789f0c + b93d771 commit 0faa7b7d2383320fc2357d687a6c535b20c7ef2b
Showing with 5 additions and 1 deletion.
  1. +3 −0 changelog.html
  2. +2 −1 core/src/main/resources/lib/form/hetero-radio.jelly
@@ -58,6 +58,9 @@
<li class=bug>
More efficient deletion of old builds (specified by date).
(<a href="https://issues.jenkins-ci.org/browse/JENKINS-22607">issue 22607</a>)
<li class=bug>
Fix a bug which only showed the first detail part for radio buttons.
(<a href="https://issues.jenkins-ci.org/browse/JENKINS-22583">issue 22583</a>)
</ul>
</div><!--=TRUNK-END=-->

@@ -40,8 +40,9 @@ THE SOFTWARE.
<table style="width:100%">
<j:set var="currentInstance" value="${instance[field]}" />
<j:set var="currentDescriptor" value="${currentInstance.descriptor}" />
<j:set var="uniqueId" value="${h.generateId()}" />
<j:forEach var="d" items="${descriptors}" varStatus="loop">
<f:radioBlock name="${field}" help="${d.helpFile}" value="${loop.index}"
<f:radioBlock name="${uniqueId}.${field}" help="${d.helpFile}" value="${loop.index}"
title="${d.displayName}" checked="${currentDescriptor==d}">
<j:set var="descriptor" value="${d}" />
<j:set var="instance" value="${currentDescriptor==d?currentInstance:null}" />

0 comments on commit 0faa7b7

Please sign in to comment.