Use ID if provided otherwise generate one

janfaracik · Jan 28, 2022 · f25a406 · f25a406
1 parent d56150d
commit f25a406
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/core/src/main/java/hudson/Functions.java b/core/src/main/java/hudson/Functions.java
@@ -2290,8 +2290,9 @@ public static boolean isContextMenuVisible(Action a) {
         }
     }
 
+    @SuppressFBWarnings(value = "PREDICTABLE_RANDOM", justification = "True randomness isn't necessary for form item IDs")
     @Restricted(NoExternalUse.class)
-    public static String generateItemId(String id) {
-        return Math.floor(Math.random() * 3000) + "-" + id;
+    public static String generateItemId() {
+        return String.valueOf(Math.floor(Math.random() * 3000));
     }
 }
diff --git a/core/src/main/resources/lib/form/radio.jelly b/core/src/main/resources/lib/form/radio.jelly
@@ -43,7 +43,7 @@ THE SOFTWARE.
       toggles the radio.
     </st:attribute>
   </st:documentation>
-  <j:set var="itemId" value="${h.generateItemId(id)}" />
+  <j:set var="itemId" value="${attrs.id ?: h.generateItemId()}" />
     <div class="jenkins-radio">
         <input class="jenkins-radio__input" type="radio" name="${attrs.name}" onclick="${attrs.onclick}"
                id="${itemId}" value="${attrs.value}" checked="${attrs.checked?'true':null}"