JENKINS-26556 fixing by not trying to overload @JavaScriptMethod methods

anymore
jenkinsci · Jan 24, 2015 · 160d3c7 · 160d3c7
1 parent 7bc6f8a
commit 160d3c7
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/src/main/java/javagh/jenkins/mashupportlets/GenericJsPortlet.java b/src/main/java/javagh/jenkins/mashupportlets/GenericJsPortlet.java
@@ -36,12 +36,12 @@ public String getContainerDivId() {
 	}
 
 	@JavaScriptMethod
-    public HttpResponse ajaxViaJenkins(String urlStr) {
+    public HttpResponse ajaxViaJenkinsWithoutAuth(String urlStr) {
 		return new ServerSideHttpCall(urlStr, null, null);
     }
 
 	@JavaScriptMethod
-    public HttpResponse ajaxViaJenkins(String urlStr, String user, String pw) {
+    public HttpResponse ajaxViaJenkinsWithAuth(String urlStr, String user, String pw) {
 		return new ServerSideHttpCall(urlStr, user, pw);
     }	
 

diff --git a/src/main/resources/javagh/jenkins/mashupportlets/GenericJsPortlet/genericjsportlet.jelly b/src/main/resources/javagh/jenkins/mashupportlets/GenericJsPortlet/genericjsportlet.jelly
@@ -9,13 +9,21 @@
 
 <script type="text/javascript">
 
-new function(divId, rootUrl, ajaxViaJenkins) {
+new function(divId, rootUrl, ajaxViaJenkinsWithoutAuth, ajaxViaJenkinsWithAuth) {
+    var ajaxViaJenkins = function() {
+        if(typeof arguments[1] === 'string') {
+            ajaxViaJenkinsWithAuth.apply(null, arguments);
+        } else {
+            ajaxViaJenkinsWithoutAuth.apply(null, arguments);
+        }
+    }
+
 /// GENERIC JS CONTENT STARTS HERE
 
 	${it.javascript}
 
 /// GENERIC JS CONTENT ENDS HERE	
-}("${it.containerDivId}", "${rootURL}", mashupPlugin_${it.id}.ajaxViaJenkins);
+}("${it.containerDivId}", "${rootURL}", mashupPlugin_${it.id}.ajaxViaJenkinsWithoutAuth, mashupPlugin_${it.id}.ajaxViaJenkinsWithAuth);
 
 </script>