From fefec372a2da48f15151bf927f78894654775d51 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica.wang@citrix.com>
Date: Thu, 29 Nov 2012 11:02:34 -0800
Subject: [PATCH] CLOUDSTACK-565: cloudstack UI - EIP/ELB Basic Zone - Network
 menu > Guest Network Section > Network detailView > Add Load Balancer tab >
 Add VMs button: pass current login's domainId and account to
 listVirtualMachines API.

---
 ui/scripts/network.js | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index 133610546e4..c53150d5ac2 100755
--- a/ui/scripts/network.js
+++ b/ui/scripts/network.js
@@ -1190,7 +1190,7 @@
                 }
               },
 
-              addloadBalancer: {
+              addloadBalancer: { // EIP/ELB Basic zone: Add Load Balancer tab in network detailView
                 title: 'label.add.load.balancer',
                 custom: function(args) {
                   var context = args.context;
@@ -1201,21 +1201,18 @@
                       listView: $.extend(true, {}, cloudStack.sections.instances, {
                         listView: {
                           filters: false,
-                          dataProvider: function(args) {                           
-														var networkid;
-														if('vpc' in args.context) 
-															networkid = args.context.multiData.tier;														
-														else 
-															networkid = args.context.ipAddresses[0].associatednetworkid;
+
+                          dataProvider: function(args) {
+                            var data = {
+                              page: args.page,
+                              pageSize: pageSize,
+															domainid: g_domainid,
+                              account: g_account,
+                              networkid: args.context.networks[0].id,
+                              listAll: true
+                            };
 														
-														var data = {
-															page: args.page,
-															pageSize: pageSize,
-															networkid: networkid,
-															listAll: true
-														};
-														
-														$.ajax({
+                            $.ajax({
                               url: createURL('listVirtualMachines'),
                               data: data,
                               dataType: 'json',