etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cloudStack - Elastic Load Balancer - IP address page - continue calling listPublicIpAddresses API instead of showing error when supportELB is "false".

This commit is contained in:
Jessica Wang 2011-08-10 10:13:30 -07:00
parent f5011189c8
commit 2a7a698a64
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ui/scripts/cloud.core.ipaddress.js
View File

@ -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({