From ac144e144673c68bb17aa0ff361c04ae55fc5db7 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Fri, 25 Feb 2011 15:44:27 -0800
Subject: [PATCH] bug 8655: Network page - Add Network dialog - show only 1
 option("account-specific") in scope field when zone.securitygroupsenabled is
 true.

---
 ui/jsp/network.jsp               | 6 ++++--
 ui/scripts/cloud.core.network.js | 7 ++++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/ui/jsp/network.jsp b/ui/jsp/network.jsp
index 3c3af10f411..c8967d4895f 100644
--- a/ui/jsp/network.jsp
+++ b/ui/jsp/network.jsp
@@ -1238,9 +1238,11 @@ dictionary = {
             <li id="add_publicip_vlan_scope_container">
                 <label for="add_publicip_vlan_scope">
                     <fmt:message key="label.scope"/>:</label>
-                <select class="select" id="add_publicip_vlan_scope">                    
+                <select class="select" id="add_publicip_vlan_scope">     
+                    <!--            
                     <option value="zone-wide"><fmt:message key="label.zone.wide"/></option>
-                    <option value="account-specific"><fmt:message key="label.account.specific"/></option>                   
+                    <option value="account-specific"><fmt:message key="label.account.specific"/></option>  
+                    -->                      
                 </select>
             </li>           
             <li style="display: none" id="add_publicip_vlan_domain_container">
diff --git a/ui/scripts/cloud.core.network.js b/ui/scripts/cloud.core.network.js
index 9cb928d8eb2..ce57b481dad 100644
--- a/ui/scripts/cloud.core.network.js
+++ b/ui/scripts/cloud.core.network.js
@@ -1173,7 +1173,12 @@ function bindAddNetworkButton($button) {
         return;
     
     var $dialogAddNetworkForZone = $("#dialog_add_network_for_zone"); 
-     
+           
+    if(zoneObj.securitygroupsenabled)
+        $dialogAddNetworkForZone.find("#add_publicip_vlan_scope").empty().append('<option value="account-specific">account-specific</option>');
+	else		
+        $dialogAddNetworkForZone.find("#add_publicip_vlan_scope").empty().append('<option value="zone-wide">zone-wide</option>').append('<option value="account-specific">account-specific</option>');
+         
 	$dialogAddNetworkForZone.find("#add_publicip_vlan_scope").change(function(event) {		    
 	    if($(this).val() == "zone-wide") {
 	        $dialogAddNetworkForZone.find("#add_publicip_vlan_domain_container").hide();