From e9b7c0b721cc96fcc4b0efddcb4119b4fa26802a Mon Sep 17 00:00:00 2001
From: Tim Jacomb <timjacomb1@gmail.com>
Date: Thu, 4 Jan 2024 22:55:06 +0000
Subject: [PATCH] JENKINS-72505 f:validateButton finds selected radio button

---
 .../java/lib/form/ValidateButtonTest.java     |  5 ++++-
 .../TestValidateIsCalled/index.jelly          | 22 ++++++++++++++++++-
 .../main/webapp/scripts/hudson-behavior.js    |  7 +++++-
 3 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/test/src/test/java/lib/form/ValidateButtonTest.java b/test/src/test/java/lib/form/ValidateButtonTest.java
index ac092e145285..da9bc286be14 100644
--- a/test/src/test/java/lib/form/ValidateButtonTest.java
+++ b/test/src/test/java/lib/form/ValidateButtonTest.java
@@ -109,13 +109,16 @@ public static final class DescriptorImpl extends Descriptor<TestValidateIsCalled
 
             public void doValidateTest1(@QueryParameter("a") String a, @QueryParameter("b") boolean b,
                                         @QueryParameter("c") boolean c, @QueryParameter("d") String d,
-                                        @QueryParameter("e") String e) {
+                                        @QueryParameter("e") String e,
+                                        @QueryParameter("f") String f
+                                        ) {
                 try {
                     assertEquals("avalue", a);
                     assertTrue(b);
                     assertFalse(c);
                     assertEquals("dvalue", d);
                     assertEquals("e2", e);
+                    assertEquals("f", f);
                     test1Outcome = null;
                 } catch (RuntimeException t) {
                     test1Outcome = t;
diff --git a/test/src/test/resources/lib/form/ValidateButtonTest/TestValidateIsCalled/index.jelly b/test/src/test/resources/lib/form/ValidateButtonTest/TestValidateIsCalled/index.jelly
index b393c22126a1..88db0f5a04f2 100644
--- a/test/src/test/resources/lib/form/ValidateButtonTest/TestValidateIsCalled/index.jelly
+++ b/test/src/test/resources/lib/form/ValidateButtonTest/TestValidateIsCalled/index.jelly
@@ -50,7 +50,27 @@ THE SOFTWARE.
           <f:option value="e2" selected="true">e2</f:option>
         </select>
       </f:entry>
-      <f:validateButton method="validateTest1" title="test" with="a,b,c,d,e" />
+
+      <f:entry title="f">
+        <f:radioBlock name="f" value="notf" title="fa" checked="false">
+          <f:entry title="fa">
+            <f:textbox name="fa"/>
+          </f:entry>
+        </f:radioBlock>
+
+        <f:radioBlock name="f" value="f" title="fb" checked="true">
+          <f:entry title="fb">
+            <f:textbox name="fb"/>
+          </f:entry>
+        </f:radioBlock>
+
+        <f:radioBlock name="f" value="reallynotf" title="fb" checked="false">
+          <f:entry title="fc">
+            <f:textbox name="fc"/>
+          </f:entry>
+        </f:radioBlock>
+      </f:entry>
+      <f:validateButton method="validateTest1" title="test" with="a,b,c,d,e,f" />
     </f:form>
   </l:main-panel>
 </l:layout>
diff --git a/war/src/main/webapp/scripts/hudson-behavior.js b/war/src/main/webapp/scripts/hudson-behavior.js
index 678260fdad17..3be3a4fddadb 100644
--- a/war/src/main/webapp/scripts/hudson-behavior.js
+++ b/war/src/main/webapp/scripts/hudson-behavior.js
@@ -2708,8 +2708,13 @@ function validateButton(checkUrl, paramList, button) {
   paramList.split(",").forEach(function (name) {
     var p = findPreviousFormItem(button, name);
     if (p != null) {
-      if (p.type == "checkbox") {
+      if (p.type === "checkbox") {
         parameters[name] = p.checked;
+      } else if (p.type === "radio") {
+        while (p && !p.checked) {
+          p = findPreviousFormItem(p, name);
+        }
+        parameters[name] = p.value;
       } else {
         parameters[name] = p.value;
       }