Skip to content

Commit 6c234a8

Browse files
Merge branch 'master' into Plugin_license_fix
2 parents f56969d + 0cdf05e commit 6c234a8

File tree

6 files changed

+529
-547
lines changed

6 files changed

+529
-547
lines changed

ath.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ set -o xtrace
66
cd "$(dirname "$0")"
77

88
# https://github.com/jenkinsci/acceptance-test-harness/releases
9-
export ATH_VERSION=6512.v7b_8c43086a_6f
9+
export ATH_VERSION=6518.v018e9d499cf2
1010

1111
if [[ $# -eq 0 ]]; then
1212
export JDK=21

core/src/main/resources/hudson/model/DirectoryBrowserSupport/dir.jelly

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,9 @@ THE SOFTWARE.
3434
<!-- parent path -->
3535
<div class="parentPath">
3636
<form>
37-
<a href="${topPath}">${it.owner.name}</a> /
37+
<a href="${topPath}">
38+
${it.owner.displayName}
39+
</a> /
3840
<j:forEach var="p" items="${parentPath}">
3941
<a href="${p.href}">${p.title}</a>
4042
/

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
"mini-css-extract-plugin": "2.9.4",
4040
"postcss": "8.5.6",
4141
"postcss-loader": "8.2.0",
42-
"postcss-preset-env": "10.6.1",
42+
"postcss-preset-env": "11.1.1",
4343
"postcss-scss": "4.0.9",
4444
"prettier": "3.8.0",
4545
"sass": "1.97.2",

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,9 @@ THE SOFTWARE.
7373
</issueManagement>
7474

7575
<properties>
76-
<revision>2.547</revision>
76+
<revision>2.548</revision>
7777
<changelist>-SNAPSHOT</changelist>
78-
<project.build.outputTimestamp>2026-01-13T06:41:44Z</project.build.outputTimestamp>
78+
<project.build.outputTimestamp>2026-01-20T06:41:48Z</project.build.outputTimestamp>
7979

8080
<!-- configuration for patch tracker plugin -->
8181
<project.patchManagement.system>github</project.patchManagement.system>

war/src/main/webapp/scripts/hudson-behavior.js

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2302,21 +2302,31 @@ function ensureVisible(e) {
23022302
function findFormParent(e, form, isStatic) {
23032303
isStatic = isStatic || false;
23042304

2305+
const originalElement = e;
2306+
23052307
if (form == null) {
23062308
// caller can pass in null to have this method compute the owning form
23072309
form = e.closest("FORM");
23082310
}
23092311

2310-
while (e != form) {
2312+
while (e !== form) {
23112313
// this is used to create a group where no single containing parent node exists,
23122314
// like <optionalBlock>
2313-
var nameRef = e.getAttribute("nameRef");
2315+
const nameRef = e.getAttribute("nameRef");
23142316
if (nameRef != null) {
23152317
e = document.getElementById(nameRef);
23162318
} else {
23172319
e = e.parentNode;
23182320
}
23192321

2322+
if (!e) {
2323+
console.warn(
2324+
"findFormParent: reached document root without finding form",
2325+
originalElement,
2326+
);
2327+
return null;
2328+
}
2329+
23202330
if (!isStatic && e.getAttribute("field-disabled") != null) {
23212331
// this field shouldn't contribute to the final result
23222332
return null;
@@ -2522,6 +2532,7 @@ function buildFormTree(form) {
25222532

25232533
return true;
25242534
} catch (e) {
2535+
console.error("Form not submitted", e);
25252536
alert(e + "\n(form not submitted)");
25262537
return false;
25272538
}

0 commit comments

Comments
 (0)