apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

bug 13924: IP Address page - Static NAT IP always support "Firewall - Port Range" regardless whether network offerings includes Firewall service or not.

Browse Source
This commit is contained in:
Jessica Wang 2012-02-22 11:19:44 -08:00
parent 4f35fb7110
commit 8b6a39cdfe
1 changed files with 8 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
ui/scripts/ui-custom/ipRules.js
View File

@ -42,7 +42,7 @@
return true; return true;
}; };
var staticNATChart = function(args, includingFirewall) { var staticNATChart = function(args) {
var $chart = $('#template').find('.network-chart.static-nat').clone(); var $chart = $('#template').find('.network-chart.static-nat').clone();
var $vmName = $chart.find('li.static-nat-enabled .vmname'); var $vmName = $chart.find('li.static-nat-enabled .vmname');
var $browser = $('#browser .container'); var $browser = $('#browser .container');
@ -92,14 +92,9 @@
} }
}); });
if(includingFirewall == true) {
$chart.find('li.firewall .view-details').click(function() { $chart.find('li.firewall .view-details').click(function() {
makeMultiEditPanel($(this), { title: _l('label.nat.port.range')}); makeMultiEditPanel($(this), { title: _l('label.nat.port.range')});
}); });
}
else {
$chart.find('li.firewall').hide();
}
return $chart; return $chart;
}; };
@ -115,12 +110,7 @@
// 1. choose between staticNAT chart and non-staticNAT chart 2. filter disabled tabs // 1. choose between staticNAT chart and non-staticNAT chart 2. filter disabled tabs
if (preFilter.length) { if (preFilter.length) {
if($.inArray('nonStaticNATChart', preFilter) != -1) { //choose static NAT chart if($.inArray('nonStaticNATChart', preFilter) != -1) { //choose static NAT chart
if($.inArray('firewall', preFilter) == -1) { return staticNATChart(args);
return staticNATChart(args, true); //static NAT including Firewall
}
else {
return staticNATChart(args, false); //static NAT excluding Firewall
}
} }
else { //choose non-static NAT chart else { //choose non-static NAT chart
$(preFilter).each(function() { $(preFilter).each(function() {
@ -131,24 +121,6 @@
}).addClass('disabled'); }).addClass('disabled');
}); });
} }
/*
if (preFilter.length == 3) { // 'firewall', 'portForwarding', 'loadBalancing'
return staticNATChart(args, true); //static NAT including Firewall
}
else if (preFilter.length == 4) { // 'firewall', 'portForwarding', 'loadBalancing', 'staticnatFirewall'
return staticNATChart(args, false); //static NAT excluding Firewall
}
else {
$(preFilter).each(function() {
var id = this;
var $li = $chart.find('li').filter(function() {
return $(this).hasClass(id);
}).addClass('disabled');
});
}
*/
} }
$chart.find('.view-details').click(function() { $chart.find('.view-details').click(function() {