From 1392d4f5fdcce06e2daaa311602d3d59d47892c1 Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Thu, 26 Jan 2012 15:25:53 -0800 Subject: [PATCH] bug 13319: cloudstack 2.2.14 - IP address page - VPN tab - pass domainId and account of the IP address owner to addVpnUser API. --- ui/scripts/cloud.core.ipaddress.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/ui/scripts/cloud.core.ipaddress.js b/ui/scripts/cloud.core.ipaddress.js index 83f5ec4fc8c..631b3ff2acd 100644 --- a/ui/scripts/cloud.core.ipaddress.js +++ b/ui/scripts/cloud.core.ipaddress.js @@ -1382,13 +1382,14 @@ function showVpnUsers(presharedkey, publicip) { isValid &= validateString("Username", $thisDialog.find("#username"), $thisDialog.find("#username_errormsg")); isValid &= validateString("Password", $thisDialog.find("#password"), $thisDialog.find("#password_errormsg")); if (!isValid) return; - + + $spinningWheel = $thisDialog.find("#spinning_wheel").show(); + var username = todb($thisDialog.find("#username").val()); var password = todb($thisDialog.find("#password").val()); - - $spinningWheel = $thisDialog.find("#spinning_wheel").show(); + $.ajax({ - data: createURL("command=addVpnUser&username="+username+"&password="+password), + data: createURL("command=addVpnUser&username=" + username + "&password=" + password + "&domainid=" + ipObj.domainid + '&account=' + ipObj.account), dataType: "json", success: function(json) { var jobId = json.addvpnuserresponse.jobid;