root
/
jenkins
mirror of https://github.com/jenkinsci/jenkins.git
1
0
Fork 0
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Backporting for LTS 2.528.1 RC (#11130)
Label conflicting PRs / main (push) Has been cancelled Details

This commit is contained in:
Mark Waite 2025-10-01 12:13:31 -06:00 committed by GitHub
parent c35644123e a9a8d1a7a9
commit 2297b19d18
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/scss/pluginSetupWizard.scss
View File

@ -263,7 +263,6 @@
top: 0; top: 0;
right: 0; right: 0;
left: 0; left: 0;
padding: 0 10px;
height: 2.75em; height: 2.75em;
z-index: 100; z-index: 100;
background: rgb(0 0 0 / 0.03); background: rgb(0 0 0 / 0.03);

5
test/src/test/java/hudson/PluginManagerUtil.java
View File

@ -71,6 +71,9 @@ public class PluginManagerUtil {
).evaluate(); ).evaluate();
} }
};
}
private static final class CustomJenkinsRule extends JenkinsRule { private static final class CustomJenkinsRule extends JenkinsRule {
CustomJenkinsRule(File home, int port) { CustomJenkinsRule(File home, int port) {
setPluginManager(null); setPluginManager(null);
@ -82,8 +85,6 @@ public class PluginManagerUtil {
return localPort; return localPort;
} }
} }
};
}
public static void dynamicLoad(String plugin, Jenkins jenkins) throws IOException, InterruptedException, RestartRequiredException { public static void dynamicLoad(String plugin, Jenkins jenkins) throws IOException, InterruptedException, RestartRequiredException {
dynamicLoad(plugin, jenkins, false); dynamicLoad(plugin, jenkins, false);

18
war/src/main/webapp/scripts/hudson-behavior.js
View File

@ -821,16 +821,16 @@ function registerMinMaxValidator(e) {
} }
if (isInteger(this.value)) { if (isInteger(this.value)) {
const valueInt = parseInt(this.value);
// Ensure the value is an integer // Ensure the value is an integer
if (min !== null && isInteger(min) && max !== null && isInteger(max)) { if (min !== null && isInteger(min) && max !== null && isInteger(max)) {
// Both min and max attributes are available // Both min and max attributes are available
const minInt = parseInt(min);
if (min <= max) { const maxInt = parseInt(max);
if (minInt <= maxInt) {
// Add the validator if min <= max // Add the validator if min <= max
if ( if (minInt > valueInt || valueInt > maxInt) {
parseInt(min) > parseInt(this.value) ||
parseInt(this.value) > parseInt(max)
) {
// The value is out of range // The value is out of range
updateValidationArea( updateValidationArea(
this.targetElement, this.targetElement,
@ -850,7 +850,8 @@ function registerMinMaxValidator(e) {
) { ) {
// There is only 'min' available // There is only 'min' available
if (parseInt(min) > parseInt(this.value)) { const minInt = parseInt(min);
if (minInt > valueInt) {
updateValidationArea( updateValidationArea(
this.targetElement, this.targetElement,
`<div class="error">This value should be larger than ${min}</div>`, `<div class="error">This value should be larger than ${min}</div>`,
@ -868,7 +869,8 @@ function registerMinMaxValidator(e) {
) { ) {
// There is only 'max' available // There is only 'max' available
if (parseInt(max) < parseInt(this.value)) { const maxInt = parseInt(max);
if (maxInt < valueInt) {
updateValidationArea( updateValidationArea(
this.targetElement, this.targetElement,
`<div class="error">This value should be less than ${max}</div>`, `<div class="error">This value should be less than ${max}</div>`,