From d660d60ea7e2e411972b215fc7f6fee9ff03e329 Mon Sep 17 00:00:00 2001
From: Jesse Glick <jglick@cloudbees.com>
Date: Mon, 16 Jun 2014 12:28:54 -0400
Subject: [PATCH] [FIXED JENKINS-23191] f:radio is not databinding-aware and
 does not correctly handle multiple configuration sections unless you make it.

---
 changelog.html                                              | 3 +++
 .../main/resources/hudson/tasks/BuildTrigger/config.jelly   | 6 +++---
 .../jenkins/triggers/ReverseBuildTrigger/config.jelly       | 6 +++---
 core/src/main/resources/lib/form/radio.jelly                | 1 +
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/changelog.html b/changelog.html
index ea445e73ec..6dacaaec33 100644
--- a/changelog.html
+++ b/changelog.html
@@ -58,6 +58,9 @@ Upcoming changes</a>
   <li class=rfe>
     Add CLI commands to add jobs to and remove jobs from views (add-job-to-view, remove-job-from-view).
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-23361">issue 23361</a>)
+  <li class=bug>
+    Failed to correctly resave a project configuration containing both a forward and a reverse build trigger.
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-23191">issue 23191</a>)
   <li class="major bug">
     HTTP error 405 when trying to restart ssh host.
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-23094">issue 23094</a>)
diff --git a/core/src/main/resources/hudson/tasks/BuildTrigger/config.jelly b/core/src/main/resources/hudson/tasks/BuildTrigger/config.jelly
index 4ff3c11354..0e2b56aab2 100644
--- a/core/src/main/resources/hudson/tasks/BuildTrigger/config.jelly
+++ b/core/src/main/resources/hudson/tasks/BuildTrigger/config.jelly
@@ -32,15 +32,15 @@ THE SOFTWARE.
 	</f:entry>
   <j:if test="${descriptor.showEvenIfUnstableOption(targetType)}"> <!-- TODO JENKINS-16444 this will always be true when first adding step -->
   	<f:entry title="">
-      <f:radio name="threshold" checked="${instance.threshold==null || instance.threshold.toString()=='SUCCESS'}"
+      <f:radio name="BuildTrigger.threshold" checked="${instance.threshold==null || instance.threshold.toString()=='SUCCESS'}"
               title="${%Trigger only if build is stable}" value="SUCCESS"/>
     </f:entry>
     <f:entry title="">
-      <f:radio name="threshold" checked="${instance.threshold.toString()=='UNSTABLE'}"
+      <f:radio name="BuildTrigger.threshold" checked="${instance.threshold.toString()=='UNSTABLE'}"
               title="${%Trigger even if the build is unstable}" value="UNSTABLE"/>
     </f:entry>
     <f:entry title="">
-      <f:radio name="threshold" checked="${instance.threshold.toString()=='FAILURE'}"
+      <f:radio name="BuildTrigger.threshold" checked="${instance.threshold.toString()=='FAILURE'}"
               title="${%Trigger even if the build fails}" value="FAILURE"/>
     </f:entry>
   </j:if>
diff --git a/core/src/main/resources/jenkins/triggers/ReverseBuildTrigger/config.jelly b/core/src/main/resources/jenkins/triggers/ReverseBuildTrigger/config.jelly
index e4c810fbe1..3a3ddd8e62 100644
--- a/core/src/main/resources/jenkins/triggers/ReverseBuildTrigger/config.jelly
+++ b/core/src/main/resources/jenkins/triggers/ReverseBuildTrigger/config.jelly
@@ -29,15 +29,15 @@ THE SOFTWARE.
         <f:textbox autoCompleteDelimChar=","/>
     </f:entry>
     <f:entry title="">
-        <f:radio name="threshold" checked="${instance.threshold==null || instance.threshold.toString()=='SUCCESS'}"
+        <f:radio name="ReverseBuildTrigger.threshold" checked="${instance.threshold==null || instance.threshold.toString()=='SUCCESS'}"
                title="${%Trigger only if build is stable}" value="SUCCESS"/>
     </f:entry>
     <f:entry title="">
-        <f:radio name="threshold" checked="${instance.threshold.toString()=='UNSTABLE'}"
+        <f:radio name="ReverseBuildTrigger.threshold" checked="${instance.threshold.toString()=='UNSTABLE'}"
                title="${%Trigger even if the build is unstable}" value="UNSTABLE"/>
     </f:entry>
     <f:entry title="">
-        <f:radio name="threshold" checked="${instance.threshold.toString()=='FAILURE'}"
+        <f:radio name="ReverseBuildTrigger.threshold" checked="${instance.threshold.toString()=='FAILURE'}"
                title="${%Trigger even if the build fails}" value="FAILURE"/>
     </f:entry>
 </j:jelly>
diff --git a/core/src/main/resources/lib/form/radio.jelly b/core/src/main/resources/lib/form/radio.jelly
index 8cd3560a56..fda884cc06 100644
--- a/core/src/main/resources/lib/form/radio.jelly
+++ b/core/src/main/resources/lib/form/radio.jelly
@@ -29,6 +29,7 @@ THE SOFTWARE.
     
     Note that safari doesn't support onchange.
 
+    Beware that the name attribute should be uniquified among all radio blocks on the page, such as by prefixing it with "G0025." or whatever gensym.
     <st:attribute name="name" />
     <st:attribute name="checked" />
     <st:attribute name="value" />
-- 
GitLab