From 217b87afb733cefa30a95495799c6c924a01337e Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Thu, 20 Jan 2011 11:52:01 -0800
Subject: [PATCH] IP Address page - DomainAdmin is allowed to manage IP created
 by a regular user under the same domain.

---
 ui/scripts/cloud.core.ipaddress.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ui/scripts/cloud.core.ipaddress.js b/ui/scripts/cloud.core.ipaddress.js
index 183cb9eda56..9fc63adfc1a 100644
--- a/ui/scripts/cloud.core.ipaddress.js
+++ b/ui/scripts/cloud.core.ipaddress.js
@@ -296,7 +296,8 @@ function ipToMidmenu(jsonObj, $midmenuItem1) {
 }
 
 function isIpManageable(domainid, account) {             
-    if((g_domainid == domainid && g_account == account) || (isAdmin() && account!="system")) 
+    if(((g_domainid == domainid && g_account == account) || (g_domainid == domainid && isDomainAdmin()) || (isAdmin())) 
+        && account!="system") 
         return true;
     else
         return false;