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

IP Address page - fix a bug "networkObj is undefined" when login as user-role.

This commit is contained in:
Jessica Wang 2011-01-07 11:58:13 -08:00
parent e57a4bce00
commit 318a5c7d0c
1 changed files with 73 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -333,19 +333,39 @@ function ipToRightPanel($midmenuItem1) {
if(ipObj.forvirtualnetwork == true) { //(public network)
if(isIpManageable(ipObj.domainid, ipObj.account) == true) {
//Port Forwarding tab
var firewallServiceObj = ipFindNetworkServiceByName("Firewall", networkObj);
var portForwardingCapabilityObj = ipFindCapabilityByName("PortForwarding", firewallServiceObj);
if(firewallServiceObj != null && portForwardingCapabilityObj != null && portForwardingCapabilityObj.value == "true")
$("#tab_port_forwarding").show();
else
$("#tab_port_forwarding").hide();
if(networkObj != null) {
var firewallServiceObj = ipFindNetworkServiceByName("Firewall", networkObj);
if(firewallServiceObj != null) {
var portForwardingCapabilityObj = ipFindCapabilityByName("PortForwarding", firewallServiceObj);
if(portForwardingCapabilityObj != null) {
if(portForwardingCapabilityObj.value == "true")
$("#tab_port_forwarding").show();
else
$("#tab_port_forwarding").hide();
}
else {
$("#tab_port_forwarding").hide();
}
}
else {
$("#tab_port_forwarding").hide();
}
}
else {
$("#tab_port_forwarding").hide();
}
//Load Balancer tab
var lbServiceObj = ipFindNetworkServiceByName("Lb", networkObj);
if(lbServiceObj != null)
$("#tab_load_balancer").show();
else
$("#tab_load_balancer").hide();
if(networkObj != null) {
var lbServiceObj = ipFindNetworkServiceByName("Lb", networkObj);
if(lbServiceObj != null)
$("#tab_load_balancer").show();
else
$("#tab_load_balancer").hide();
}
else {
$("#tab_load_balancer").hide();
}
//VPN tab
var vpnServiceObj = ipFindNetworkServiceByName("Vpn", networkObj);
@ -388,15 +408,20 @@ function ipJsonToPortForwardingTab() {
$thisTab.find("#tab_container").hide();
$thisTab.find("#tab_spinning_wheel").show();
var firewallServiceObj = ipFindNetworkServiceByName("Firewall", networkObj);
var supportedProtocolsCapabilityObj = ipFindCapabilityByName("SupportedProtocols", firewallServiceObj);
if(supportedProtocolsCapabilityObj != null) {
var protocols = supportedProtocolsCapabilityObj.value.toUpperCase(); //e.g. "tcp,udp" => "TCP,UDP"
var array1 = protocols.split(",");
var $protocolField = $("#create_port_forwarding_row").find("#protocol").empty();
for(var i=0; i<array1.length; i++)
$protocolField.append("<option value='"+array1[i]+"'>"+array1[i]+"</option>")
if(networkObj != null) {
var firewallServiceObj = ipFindNetworkServiceByName("Firewall", networkObj);
if(firewallServiceObj != null) {
var supportedProtocolsCapabilityObj = ipFindCapabilityByName("SupportedProtocols", firewallServiceObj);
if(supportedProtocolsCapabilityObj != null) {
var protocols = supportedProtocolsCapabilityObj.value.toUpperCase(); //e.g. "tcp,udp" => "TCP,UDP"
var array1 = protocols.split(",");
var $protocolField = $("#create_port_forwarding_row").find("#protocol").empty();
for(var i=0; i<array1.length; i++)
$protocolField.append("<option value='"+array1[i]+"'>"+array1[i]+"</option>")
}
}
}
refreshCreatePortForwardingRow();
$.ajax({
@ -438,18 +463,23 @@ function ipJsonToLoadBalancerTab() {
$thisTab.find("#tab_container").hide();
$thisTab.find("#tab_spinning_wheel").show();
var lbServiceObj = ipFindNetworkServiceByName("Lb", networkObj);
var supportedLbAlgorithmsCapabilityObj = ipFindCapabilityByName("SupportedLbAlgorithms", lbServiceObj);
if(lbServiceObj != null && supportedLbAlgorithmsCapabilityObj != null) {
var algorithms = supportedLbAlgorithmsCapabilityObj.value; //e.g. "roundrobin,leastconn,sourceip"
var array1 = algorithms.split(",");
var $algorithmField1 = $("#create_load_balancer_row").find("#algorithm_select").empty();
var $algorithmField2 = $("#load_balancer_template").find("#row_container_edit").find("#algorithm_select").empty();
for(var i=0; i<array1.length; i++) {
$algorithmField1.append("<option value='"+array1[i]+"'>"+array1[i]+"</option>");
$algorithmField2.append("<option value='"+array1[i]+"'>"+array1[i]+"</option>");
}
}
if(networkObj != null) {
var lbServiceObj = ipFindNetworkServiceByName("Lb", networkObj);
if(lbServiceObj != null) {
var supportedLbAlgorithmsCapabilityObj = ipFindCapabilityByName("SupportedLbAlgorithms", lbServiceObj);
if(supportedLbAlgorithmsCapabilityObj != null) {
var algorithms = supportedLbAlgorithmsCapabilityObj.value; //e.g. "roundrobin,leastconn,sourceip"
var array1 = algorithms.split(",");
var $algorithmField1 = $("#create_load_balancer_row").find("#algorithm_select").empty();
var $algorithmField2 = $("#load_balancer_template").find("#row_container_edit").find("#algorithm_select").empty();
for(var i=0; i<array1.length; i++) {
$algorithmField1.append("<option value='"+array1[i]+"'>"+array1[i]+"</option>");
$algorithmField2.append("<option value='"+array1[i]+"'>"+array1[i]+"</option>");
}
}
}
}
refreshCreateLoadBalancerRow();
$.ajax({
@ -943,12 +973,18 @@ function ipJsonToDetailsTab() {
buildActionLinkForTab("Disable Static NAT", ipActionMap, $actionMenu, $midmenuItem1, $thisTab);
noAvailableActions = false;
} else {
if(ipObj.issourcenat != true) {
var firewallServiceObj = ipFindNetworkServiceByName("Firewall", networkObj);
var staticNatCapabilityObj = ipFindCapabilityByName("StaticNat", firewallServiceObj);
if(firewallServiceObj != null && staticNatCapabilityObj != null && staticNatCapabilityObj.value == "true")
buildActionLinkForTab("Enable Static NAT", ipActionMap, $actionMenu, $midmenuItem1, $thisTab);
if(ipObj.issourcenat != true) {
if(networkObj != null) {
var firewallServiceObj = ipFindNetworkServiceByName("Firewall", networkObj);
if(firewallServiceObj != null) {
var staticNatCapabilityObj = ipFindCapabilityByName("StaticNat", firewallServiceObj);
if(staticNatCapabilityObj != null) {
if(staticNatCapabilityObj.value == "true")
buildActionLinkForTab("Enable Static NAT", ipActionMap, $actionMenu, $midmenuItem1, $thisTab);
}
}
}
buildActionLinkForTab("Release IP", ipActionMap, $actionMenu, $midmenuItem1, $thisTab);
noAvailableActions = false;
}