From 562dd29bfb8f01a951cd278197c3568d8c038171 Mon Sep 17 00:00:00 2001
From: bfederle <bfederle@gmail.com>
Date: Thu, 10 May 2012 17:04:55 -0700
Subject: [PATCH] IP addresses: fix for projects + port forwarding

-Port forwarding: only show VMs of the IP's owner

-Don't pass account/domain ID for acquire IP address and list VMs for
 static NAT/PF/LB
---
 ui/scripts/network.js | 68 ++++++++++++++++++++++++++++---------------
 1 file changed, 45 insertions(+), 23 deletions(-)

diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index 244e0b2b02d..40b58b00043 100644
--- a/ui/scripts/network.js
+++ b/ui/scripts/network.js
@@ -928,7 +928,7 @@
               addRow: 'true',
               action: function(args) {
                 var apiCmd = "associateIpAddress";
-                if(args.context.networks[0].type == "Shared")
+                if(args.context.networks[0].type == "Shared" && !args.context.projects)
                   apiCmd += "&domainid=" + g_domainid + "&account=" + g_account;
                 $.ajax({
                   url: createURL(apiCmd),
@@ -1174,16 +1174,23 @@
                     listView: $.extend(true, {}, cloudStack.sections.instances, {
                       listView: {
                         dataProvider: function(args) {
+                          var data = {
+                            page: args.page,
+                            pageSize: pageSize,
+                            networkid: args.context.networks[0].id,
+                            listAll: true
+                          };
+
+                          if (!args.context.projects) {
+                            $.extend(data, {
+                              account: args.context.ipAddresses[0].account,
+                              domainid: args.context.ipAddresses[0].domainid
+                            }); 
+                          }
+                          
                           $.ajax({
                             url: createURL('listVirtualMachines'),
-                            data: {
-                              page: args.page,
-                              pageSize: pageSize,
-                              networkid: args.context.networks[0].id,
-                              account: args.context.ipAddresses[0].account,
-                              domainid: args.context.ipAddresses[0].domainid,
-                              listAll: true
-                            },
+                            data: data,
                             dataType: 'json',
                             async: true,
                             success: function(data) {
@@ -1758,17 +1765,23 @@
                         dataProvider: function(args) {
                           var itemData = $.isArray(args.context.multiRule) && args.context.multiRule[0]['_itemData'] ?
                             args.context.multiRule[0]['_itemData'] : [];
+                          var data = {
+                            page: args.page,
+                            pageSize: pageSize,
+                            networkid: args.context.ipAddresses[0].associatednetworkid,
+                            listAll: true
+                          };
+
+                          if (!args.context.projects) {
+                            $.extend(data, {
+                              account: args.context.ipAddresses[0].account,
+                              domainid: args.context.ipAddresses[0].domainid
+                            }); 
+                          }
 
                           $.ajax({
                             url: createURL('listVirtualMachines'),
-                            data: {
-                              page: args.page,
-                              pageSize: pageSize,
-                              networkid: args.context.ipAddresses[0].associatednetworkid,
-                              account: args.context.ipAddresses[0].account,
-                              domainid: args.context.ipAddresses[0].domainid,
-                              listAll: true
-                            },
+                            data: data,
                             dataType: 'json',
                             async: true,
                             success: function(data) {
@@ -2124,14 +2137,23 @@
                     listView: $.extend(true, {}, cloudStack.sections.instances, {
                       listView: {
                         dataProvider: function(args) {
+                          var data = {
+                            page: args.page,
+                            pageSize: pageSize,
+                            listAll: true,
+                            networkid: args.context.ipAddresses[0].associatednetworkid
+                          };
+
+                          if (!args.context.projects) {
+                            $.extend(data, {
+                              account: args.context.ipAddresses[0].account,
+                              domainid: args.context.ipAddresses[0].domainid
+                            }); 
+                          }
+
                           $.ajax({
                             url: createURL('listVirtualMachines'),
-                            data: {
-                              page: args.page,
-                              pageSize: pageSize,
-                              listAll: true,
-                              networkid: args.context.ipAddresses[0].associatednetworkid
-                            },
+                            data: data,
                             dataType: 'json',
                             async: true,
                             success: function(data) {