apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-02 20:02:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

bug 12925: pass account parameter to ListVpnUsers API and createRemoteAccessVpn API.

Browse Source
This commit is contained in:
Jessica Wang 2012-02-01 13:49:37 -08:00
parent 2f17d465dc
commit 5eea6a5c3c
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ui/scripts/network.js
View File

@ -979,7 +979,8 @@
url: createURL('createRemoteAccessVpn'),
data: {
publicipid: args.context.ipAddresses[0].id,
domainid: args.context.ipAddresses[0].domainid
domainid: args.context.ipAddresses[0].domainid,
account: args.context.ipAddresses[0].account
},
dataType: 'json',
async: true,
@ -2136,8 +2137,10 @@
vpn: {
title: 'VPN',
custom: function(args) {
var ipAddress = args.context.ipAddresses[0].ipaddress;
var psk = args.context.ipAddresses[0].remoteaccessvpn.presharedkey;
var ipAddress = args.context.ipAddresses[0].ipaddress;
var psk = "";
if(args.context.ipAddresses[0].remoteaccessvpn != null)
psk = args.context.ipAddresses[0].remoteaccessvpn.presharedkey;
return $('<div>')
.append(
@ -2213,11 +2216,12 @@
}
}
},
dataProvider: function(args) {
dataProvider: function(args) {
$.ajax({
url: createURL('listVpnUsers'),
data: {
domainid: args.context.ipAddresses[0].domainid
domainid: args.context.ipAddresses[0].domainid,
account: args.context.ipAddresses[0].account
},
dataType: 'json',
async: true,