mirror of https://github.com/jenkinsci/jenkins.git
Backporting for LTS 2.528.1 RC (#11130)
Label conflicting PRs / main (push) Has been cancelled
Details
Label conflicting PRs / main (push) Has been cancelled
Details
This commit is contained in:
commit
2297b19d18
|
@ -263,7 +263,6 @@
|
|||
top: 0;
|
||||
right: 0;
|
||||
left: 0;
|
||||
padding: 0 10px;
|
||||
height: 2.75em;
|
||||
z-index: 100;
|
||||
background: rgb(0 0 0 / 0.03);
|
||||
|
|
|
@ -71,20 +71,21 @@ public class PluginManagerUtil {
|
|||
).evaluate();
|
||||
}
|
||||
|
||||
private static final class CustomJenkinsRule extends JenkinsRule {
|
||||
CustomJenkinsRule(File home, int port) {
|
||||
setPluginManager(null);
|
||||
with(() -> home);
|
||||
localPort = port;
|
||||
}
|
||||
|
||||
int getPort() {
|
||||
return localPort;
|
||||
}
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
private static final class CustomJenkinsRule extends JenkinsRule {
|
||||
CustomJenkinsRule(File home, int port) {
|
||||
setPluginManager(null);
|
||||
with(() -> home);
|
||||
localPort = port;
|
||||
}
|
||||
|
||||
int getPort() {
|
||||
return localPort;
|
||||
}
|
||||
}
|
||||
|
||||
public static void dynamicLoad(String plugin, Jenkins jenkins) throws IOException, InterruptedException, RestartRequiredException {
|
||||
dynamicLoad(plugin, jenkins, false);
|
||||
}
|
||||
|
|
|
@ -821,16 +821,16 @@ function registerMinMaxValidator(e) {
|
|||
}
|
||||
|
||||
if (isInteger(this.value)) {
|
||||
const valueInt = parseInt(this.value);
|
||||
|
||||
// Ensure the value is an integer
|
||||
if (min !== null && isInteger(min) && max !== null && isInteger(max)) {
|
||||
// Both min and max attributes are available
|
||||
|
||||
if (min <= max) {
|
||||
const minInt = parseInt(min);
|
||||
const maxInt = parseInt(max);
|
||||
if (minInt <= maxInt) {
|
||||
// Add the validator if min <= max
|
||||
if (
|
||||
parseInt(min) > parseInt(this.value) ||
|
||||
parseInt(this.value) > parseInt(max)
|
||||
) {
|
||||
if (minInt > valueInt || valueInt > maxInt) {
|
||||
// The value is out of range
|
||||
updateValidationArea(
|
||||
this.targetElement,
|
||||
|
@ -850,7 +850,8 @@ function registerMinMaxValidator(e) {
|
|||
) {
|
||||
// There is only 'min' available
|
||||
|
||||
if (parseInt(min) > parseInt(this.value)) {
|
||||
const minInt = parseInt(min);
|
||||
if (minInt > valueInt) {
|
||||
updateValidationArea(
|
||||
this.targetElement,
|
||||
`<div class="error">This value should be larger than ${min}</div>`,
|
||||
|
@ -868,7 +869,8 @@ function registerMinMaxValidator(e) {
|
|||
) {
|
||||
// There is only 'max' available
|
||||
|
||||
if (parseInt(max) < parseInt(this.value)) {
|
||||
const maxInt = parseInt(max);
|
||||
if (maxInt < valueInt) {
|
||||
updateValidationArea(
|
||||
this.targetElement,
|
||||
`<div class="error">This value should be less than ${max}</div>`,
|
||||
|
|
Loading…
Reference in New Issue