From e7d55d77f5d71eb945d30ec80fe548bb6f8d1872 Mon Sep 17 00:00:00 2001
From: bfederle <bfederle@gmail.com>
Date: Tue, 17 Jan 2012 10:56:27 -0800
Subject: [PATCH] bug 12306

-Use listAll=true for projects and networks listing as ROOT admin
---
 ui/scripts/network.js  | 1 +
 ui/scripts/projects.js | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index d90a526518b..b0ef0852a14 100644
--- a/ui/scripts/network.js
+++ b/ui/scripts/network.js
@@ -196,6 +196,7 @@
           id: 'networks',
           fields: {
             name: { label: 'Name' },
+            accounts: { label: 'Account' },
             zonename: { label: 'Zone' },
             type: { label: 'Type' },
             vlan: { label: 'VLAN' },
diff --git a/ui/scripts/projects.js b/ui/scripts/projects.js
index 8b7a124cf33..41d88a9fae1 100644
--- a/ui/scripts/projects.js
+++ b/ui/scripts/projects.js
@@ -485,7 +485,8 @@
       $.ajax({
         url: createURL('listProjects', { ignoreProject: true }),
         data: {
-          accountId: user.userid
+          accountId: user.userid,
+          listAll: isAdmin()
         },
         dataType: 'json',
         async: true,
@@ -538,7 +539,7 @@
 							}
 						}
 					
-					  var apiCmd = "listProjects&page=" + args.page + "&pagesize=" + pageSize + array1.join("");					
+					  var apiCmd = "listProjects&page=" + args.page + "&pagesize=" + pageSize + array1.join("") + '&listAll=' + isAdmin();					
             $.ajax({
               url: createURL(apiCmd, { ignoreProject: true }),
               dataType: 'json',