From dbd6fd9826982cfbc9b3ffaf4a77931e28022b3e Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Wed, 10 Aug 2011 10:42:19 -0700
Subject: [PATCH] bug 11025: cloudStack - Elastic Load Balancer - IP address
 page - continue calling listPublicIpAddresses API instead of showing error
 when supportELB is "false".

---
 ui/scripts/cloud.core.ipaddress.js | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/ui/scripts/cloud.core.ipaddress.js b/ui/scripts/cloud.core.ipaddress.js
index 9030c7b220e..7a0843d9714 100644
--- a/ui/scripts/cloud.core.ipaddress.js
+++ b/ui/scripts/cloud.core.ipaddress.js
@@ -71,8 +71,7 @@ function afterLoadIpJSP() {
     var tabContentArray = [$("#tab_content_details"), $("#tab_content_port_range"), $("#tab_content_port_forwarding"), $("#tab_content_load_balancer"), $("#tab_content_vpn")];
     var afterSwitchFnArray = [ipJsonToDetailsTab, ipJsonToPortRangeTab, ipJsonToPortForwardingTab, ipJsonToLoadBalancerTab, ipJsonToVPNTab];
     switchBetweenDifferentTabs(tabArray, tabContentArray, afterSwitchFnArray);       
-    //***** switch between different tabs (end) **********************************************************************
-        
+    //***** switch between different tabs (end) **********************************************************************  
     if(g_supportELB == "guest" || g_supportELB == "public") {
 		$("#tab_details,#tab_port_range,#tab_port_forwarding,#tab_load_balancer,#tab_vpn").hide();	
 				
@@ -1385,12 +1384,8 @@ function ipJsonToDetailsTab() {
 	else if(g_supportELB == "public") {
 		cmd = "command=listPublicIpAddresses&forvirtualnetwork=true&id="+publicipid;
 	}
-	else {
-		if(g_supportELB == null)
-	        alert("supportELB should be either guest or public. It should not be null.");
-	    else 
-	    	alert("supportELB should be either guest or public. It should not be " + g_supportELB);
-		return;
+	else { //g_supportELB == "false"
+		cmd = "command=listPublicIpAddresses&id="+publicipid;
 	}		
     
     $.ajax({