From 45a8d4e811d14598ce706441b3bde02cde73ef0b Mon Sep 17 00:00:00 2001
From: bfederle <bfederle@gmail.com>
Date: Fri, 27 Jan 2012 10:55:47 -0800
Subject: [PATCH] bug 13364: Fix security group listing when in projects mode

status 13364: resolved fixed
---
 ui/scripts/instances.js | 8 +++++++-
 ui/scripts/network.js   | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js
index 706d545db26..047d8e81c7e 100644
--- a/ui/scripts/instances.js
+++ b/ui/scripts/instances.js
@@ -288,10 +288,16 @@
 
                   else if(step5ContainerType == 'select-security-group') {
                     var securityGroupArray = [];
+                    var data = {
+                      domainid: g_domainid,
+                      account: g_account
+                    };
+                    
                     $.ajax({
-                      url: createURL("listSecurityGroups"+"&domainid="+g_domainid+"&account="+g_account),
+                      url: createURL("listSecurityGroups"),
                       dataType: "json",
                       async: false,
+                      data: cloudStack.context.projects ? {} : data,
                       success: function(json) {
                         var items = json.listsecuritygroupsresponse.securitygroup;
                         if (items != null && items.length > 0) {
diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index 5dc046300fd..ccee3f2ef18 100644
--- a/ui/scripts/network.js
+++ b/ui/scripts/network.js
@@ -87,7 +87,7 @@
     sectionSelect: {
       preFilter: function(args) {       
         $.ajax({
-          url: createURL('listNetworks'),
+          url: createURL('listNetworks', { ignoreProject: true }),
           data: {
             supportedServices: 'SecurityGroup',
 						listAll: true