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

CS-15792: cloudstack 3.0 UI - VPC - pass domainid+account instead of listAll to all listNetworks API calls under VPC section.

Browse Source
This commit is contained in:
Jessica Wang 2012-08-01 16:10:04 -07:00
parent babc868de6
commit a902443708
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ui/scripts/network.js
View File

@ -1383,8 +1383,10 @@
async: false,
data: {
vpcid: args.context.vpc[0].id,
listAll: true,
supportedservices: 'StaticNat'
//listAll: true, //do not pass listAll to listNetworks under VPC
domainid: args.context.vpc[0].domainid,
account: args.context.vpc[0].account,
supportedservices: 'StaticNat'
},
success: function(json) {
var networks = json.listnetworksresponse.network;
@ -2208,12 +2210,14 @@
select: function(args) {
if('vpc' in args.context) {
var data = {
listAll: true,
//listAll: true, //do not pass listAll to listNetworks under VPC
supportedservices: 'Lb'
};
if(args.context.ipAddresses[0].associatednetworkid == null) {
$.extend(data, {
vpcid: args.context.vpc[0].id
vpcid: args.context.vpc[0].id,
domainid: args.context.vpc[0].domainid,
account: args.context.vpc[0].account
});
}
else {
@ -2615,12 +2619,14 @@
select: function(args) {
if('vpc' in args.context) {
var data = {
listAll: true,
//listAll: true, //do not pass listAll to listNetworks under VPC
supportedservices: 'PortForwarding'
};
if(args.context.ipAddresses[0].associatednetworkid == null) {
$.extend(data, {
vpcid: args.context.vpc[0].id
vpcid: args.context.vpc[0].id,
domainid: args.context.vpc[0].domainid,
account: args.context.vpc[0].account
});
}
else {

4
ui/scripts/vpc.js
View File

@ -1900,7 +1900,9 @@
dataType: "json",
data: {
vpcid: args.context.vpc[0].id,
listAll: true
//listAll: true, //do not pass listAll to listNetworks under VPC
domainid: args.context.vpc[0].domainid,
account: args.context.vpc[0].account
},
async: true,
success: function(json) {