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

Jessica Wang · Jessica Wang · commit a902443708ee · 2012-08-01T16:10:41.000-07:00
diff --git a/ui/scripts/network.js b/ui/scripts/network.js
@@ -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 {
diff --git a/ui/scripts/vpc.js b/ui/scripts/vpc.js
@@ -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) {					  
