fix: 机器人配置测试时 js 报错

jenkinsci · Sep 10, 2022 · 73ebe79 · 73ebe79
1 parent da0fd02
commit 73ebe79
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 8 deletions.
diff --git a/pom.xml b/pom.xml
@@ -13,7 +13,7 @@
   <version>2.4.10-SNAPSHOT</version>
   <packaging>hpi</packaging>
   <properties>
-    <jenkins.version>2.346.3</jenkins.version>
+    <jenkins.version>2.361.1</jenkins.version>
     <java.level>8</java.level>
     <plugin.minimumJavaVersion>8</plugin.minimumJavaVersion>
     <hpi.compatibleSinceVersion>2.0.0</hpi.compatibleSinceVersion>

diff --git a/src/main/java/io/jenkins/plugins/DingTalkRobotConfig.java b/src/main/java/io/jenkins/plugins/DingTalkRobotConfig.java
@@ -192,10 +192,7 @@ public FormValidation doTest(
         String rootUrl = Jenkins.get().getRootUrl();
         return FormValidation.respond(
             Kind.OK,
-            "<img src='"
-                + rootUrl
-                + "/images/16x16/accept.png'>"
-                + "<span style='padding-left:4px;color:#52c41a;font-weight:bold;'>测试成功</span>");
+            "<span style='color:#52c41a;font-weight:bold;'>测试成功</span>");
       }
       return FormValidation.error(message);
     }

diff --git a/src/main/resources/io/jenkins/plugins/DingTalkRobotConfig/config.jelly b/src/main/resources/io/jenkins/plugins/DingTalkRobotConfig/config.jelly
@@ -55,8 +55,5 @@
         data-validate-button-with="${with}"
       />
     </div>
-
   </div>
-
-
 </j:jelly>
diff --git a/src/main/webapp/scripts/robotConfigValidator.js b/src/main/webapp/scripts/robotConfigValidator.js
@@ -7,6 +7,26 @@
     $(document).on('click', '.robot-config-validate-btn', validateRobotConfig)
   })
 
+  function applyErrorMessage(elt, rsp) {
+    if (rsp.status == 200) {
+      elt.innerHTML = rsp.responseText;
+    } else {
+      var id = 'valerr' + (iota++);
+      elt.innerHTML = '<a href="" onclick="document.getElementById(\'' + id
+          + '\').style.display=\'block\';return false">ERROR</a><div id="'
+          + id + '" style="display:none">' + rsp.responseText + '</div>';
+      var error = document.getElementById('error-description'); // cf. oops.jelly
+      if (error) {
+        var div = document.getElementById(id);
+        while (div.firstElementChild) {
+          div.removeChild(div.firstElementChild);
+        }
+        div.appendChild(error);
+      }
+    }
+    Behaviour.applySubtree(elt);
+  }
+
   function validateRobotConfig() {
     var $btn = $(this)