From f640efc087add43d31fdd92cd24be99af99fa4f5 Mon Sep 17 00:00:00 2001
From: Markus Winter <m.winter@sap.com>
Date: Thu, 25 Jan 2024 15:45:20 +0100
Subject: [PATCH] [JENKINS-71025] Remove inline JS from configure-common
 (#8866)

* [JENKINS-71025] Remove inline JS from configure-common

replaces #6861

* remove inline jd for jdk check
---
 core/src/main/java/hudson/model/AbstractProject.java         | 5 +++++
 .../hudson/model/AbstractProject/configure-common.jelly      | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/hudson/model/AbstractProject.java b/core/src/main/java/hudson/model/AbstractProject.java
index cceff9c42b19..c554ef813440 100644
--- a/core/src/main/java/hudson/model/AbstractProject.java
+++ b/core/src/main/java/hudson/model/AbstractProject.java
@@ -1940,6 +1940,11 @@ public boolean isApplicable(Descriptor descriptor) {
             return true;
         }
 
+        @Restricted(DoNotUse.class)
+        public FormValidation doCheckDisplayNameOrNull(@AncestorInPath AbstractProject project, @QueryParameter String value) {
+            return Jenkins.get().doCheckDisplayName(value, project.getName());
+        }
+
         @Restricted(DoNotUse.class)
         public FormValidation doCheckAssignedLabelString(@AncestorInPath AbstractProject<?, ?> project,
                                                          @QueryParameter String value) {
diff --git a/core/src/main/resources/hudson/model/AbstractProject/configure-common.jelly b/core/src/main/resources/hudson/model/AbstractProject/configure-common.jelly
index 096922c27966..25121308d1a4 100644
--- a/core/src/main/resources/hudson/model/AbstractProject/configure-common.jelly
+++ b/core/src/main/resources/hudson/model/AbstractProject/configure-common.jelly
@@ -35,7 +35,7 @@ THE SOFTWARE.
     <!-- if there's only one JDK configured, always use that. -->
     <f:entry title="JDK"
              description="${%JDK to be used for this project}">
-      <select class="jenkins-input validated" name="jdk" checkUrl="'${rootURL}/defaultJDKCheck?value='+this.value">
+      <select class="jenkins-input validated" name="jdk" checkUrl="${rootURL}/defaultJDKCheck" checkDependsOn="">
         <j:getStatic var="DEFAULT_NAME" className="hudson.model.JDK" field="DEFAULT_NAME"/>
         <option>${DEFAULT_NAME}</option>
         <j:forEach var="inst" items="${jdks}">
@@ -54,7 +54,7 @@ THE SOFTWARE.
     <p:config-blockWhenDownstreamBuilding />
     <st:include page="configure-advanced.jelly" optional="true" />
     <f:entry title="${%Display Name}" field="displayNameOrNull">
-      <f:textbox checkUrl="'${rootURL}/checkDisplayName?displayName='+encodeURIComponent(this.value)+'&amp;jobName='+encodeURIComponent('${h.jsStringEscape(it.name)}')"/>
+      <f:textbox/>
     </f:entry>
     <f:optionalBlock name="keepDependencies" checked="${it.keepDependencies}" title="${%Keep the build logs of dependencies}" help="/help/tasks/fingerprint/keepDependencies.html"/>
   </f:advanced>