Use unique ID for forms

jenkinsci · Oct 27, 2024 · e2b61e2 · e2b61e2
1 parent 6faa35a
commit e2b61e2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/main/resources/hudson/plugins/ec2/EC2Cloud/computerSet.jelly b/src/main/resources/hudson/plugins/ec2/EC2Cloud/computerSet.jelly
@@ -25,6 +25,7 @@ THE SOFTWARE.
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler"
          xmlns:l="/lib/layout" xmlns:dd="/lib/layout/dropdowns" xmlns:f="/lib/form">
   <j:if test="${it.hasPermission(it.PROVISION)}">
+    <j:set var="formId" value="${h.generateId()}"/>
     <tr>
       <td />
       <td colspan="${monitors.size()+2}">
@@ -36,13 +37,14 @@ THE SOFTWARE.
             <dd:custom>
               <button class="jenkins-dropdown__item"
                       data-type="ec2-provision"
+                      data-form="${formId}"
                       data-url="${t.description}">
                 ${t.displayName}
               </button>
             </dd:custom>
           </j:forEach>
         </l:overflowButton>
-        <f:form action="${rootURL}/${it.url}/provision" method="post" name="provision">
+        <f:form action="${rootURL}/${it.url}/provision" method="post" name="provision" id="${formId}">
           <input name="template" type="hidden"/>
         </f:form>
         <st:adjunct includes="hudson.plugins.ec2.EC2Cloud.provision"/>

diff --git a/src/main/resources/hudson/plugins/ec2/EC2Cloud/provision.js b/src/main/resources/hudson/plugins/ec2/EC2Cloud/provision.js
@@ -1,6 +1,6 @@
 Behaviour.specify("[data-type='ec2-provision']", 'ec2-provision', -99, function(e) {
   e.addEventListener("click", function (event) {
-    const form = document.querySelector("form[name='provision']");
+    const form = document.getElementById(e.dataset.form);
     form.querySelector("[name='template']").value = e.dataset.url;
     buildFormTree(form);
     form.submit();