Merge pull request apache#1325 from remibergsma/vpc_ui_fix_47

remibergsma · remibergsma · commit 80703ca33c07 · 2016-01-11T16:19:46.000+01:00
CLOUDSTACK-9221 Allow admin to see user VMs on port forwarding pageOn commit a902443 the 'listAll=true' is removed. On some places the domainid and accountid are added but not on these. I added them now. It's either doing this, or readding listAll is true. I've seeing other folks doing that so let's see what performs best. * pr/1325: Admin cannot see VMs on port forwarding page Signed-off-by: Remi Bergsma <github@remi.nl>
diff --git a/ui/scripts/network.js b/ui/scripts/network.js
@@ -3526,6 +3526,8 @@
                                                     if ('vpc' in args.context) {
                                                         var data = {
                                                             //listAll: true,  //do not pass listAll to listNetworks under VPC
+                                                            domainid: args.context.vpc[0].domainid,
+                                                            account: args.context.vpc[0].account,
                                                             supportedservices: 'Lb'
                                                         };
                                                         if (args.context.ipAddresses[0].associatednetworkid == null) {
@@ -4158,6 +4160,8 @@
                                                     if ('vpc' in args.context) {
                                                         var data = {
                                                             //listAll: true,  //do not pass listAll to listNetworks under VPC
+                                                            domainid: args.context.vpc[0].domainid,
+                                                            account: args.context.vpc[0].account,
                                                             supportedservices: 'PortForwarding'
                                                         };
                                                         if (args.context.ipAddresses[0].associatednetworkid == null) {
