[FIXED JENKINS-19457]

Merge remote-tracking branch 'origin/pr/934'
jenkinsci · Sep 5, 2013 · b94cab3 · b94cab3
2 parents dfd6049 + 010f2dd
commit b94cab3
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/changelog.html b/changelog.html
@@ -61,6 +61,9 @@
   <li class=bug>
     When copying a directory from master to slave fails due to an error on the slave, properly report it.
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-9540">issue 9540</a>)
+  <li class=rfe>
+    JavaScript error in the checkUrl computation shouldn't break the job configuration page.
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-19457">issue 19457</a>)
   <li class=rfe>
     Annotate the Advanced section if some fields are already customized.
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-3107">issue 3107</a>)

diff --git a/war/src/main/webapp/scripts/hudson-behavior.js b/war/src/main/webapp/scripts/hudson-behavior.js
@@ -413,7 +413,13 @@ function registerValidator(e) {
         var depends = this.getAttribute("checkDependsOn");
 
         if (depends==null) {// legacy behaviour where checkUrl is a JavaScript
-            return eval(url); // need access to 'this', so no 'geval'
+            try {
+                return eval(url); // need access to 'this', so no 'geval'
+            } catch (e) {
+                if (window.console!=null)  console.warn("Legacy checkUrl '" + url + "' is not valid Javascript: "+e);
+                if (window.YUI!=null)      YUI.log("Legacy checkUrl '" + url + "' is not valid Javascript: "+e,"warn");
+                return url; // return plain url as fallback
+            }
         } else {
             var q = qs(this).addThis();
             if (depends.length>0)