From de5312929e124021ebb752d94a8f8a61a2c06229 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Thu, 23 Dec 2010 19:19:54 -0800
Subject: [PATCH] IP Address page - (1) show Load Balancer tab if network
 service includes { "name": "LB" }. Hide it otherwise. (2) show VPN tab if
 network service includes { "name": "Vpn" }. Hide it otherwise.

---
 ui/scripts/cloud.core.ipaddress.js | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/ui/scripts/cloud.core.ipaddress.js b/ui/scripts/cloud.core.ipaddress.js
index 0dcac372dac..a506daef9c0 100644
--- a/ui/scripts/cloud.core.ipaddress.js
+++ b/ui/scripts/cloud.core.ipaddress.js
@@ -333,18 +333,26 @@ function ipToRightPanel($midmenuItem1) {
         $("#tab_port_forwarding, #tab_load_balancer, #tab_vpn").hide();	
     }
     else { //ipObj.isstaticnat == false  
-        if(ipObj.forvirtualnetwork == true) { //(public network)
-            //Port Forwarding tab, Load Balancer tab
+        if(ipObj.forvirtualnetwork == true) { //(public network)            
             if(isIpManageable(ipObj.domainid, ipObj.account) == true) {   
+	            //Port Forwarding tab
 	            if(networkObj != null && networkObj.service[0].capability[0].name == "PortForwarding" && networkObj.service[0].capability[0].value == "true")
 	                $("#tab_port_forwarding").show();   
 	            else
 	                $("#tab_port_forwarding").hide();
 	            
-	            $("#tab_load_balancer").show();
-		        // Only show VPN tab if the IP is the source nat IP
+	            //Load Balancer tab	            
+	            if(networkObj != null && networkObj.service[6].name == "Lb")
+	                $("#tab_load_balancer").show();
+	            else
+	                $("#tab_load_balancer").hide();	                 	            
+		        
+		        //VPN tab
 		        if (ipObj.issourcenat == true) {
-			        $("#tab_vpn").show();
+		            if(networkObj.service[3].name == "Vpn")
+			            $("#tab_vpn").show();
+			        else
+			            $("#tab_vpn").hide();
 		        }             
             } 
             else {