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

add zone wizard - preFilters - addPublicNetwork - consolidate conditinal statement [reviewed-by: Brian]

This commit is contained in:
Jessica Wang 2012-02-17 12:48:04 -08:00
parent b287c9aa15
commit 28f574d890
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ui/scripts/zoneWizard.js
View File

@ -98,18 +98,9 @@
},
preFilters: {
addPublicNetwork: function(args) {
var $publicTrafficDesc = $('.zone-wizard:visible').find('#add_zone_public_traffic_desc');
if (args.data['network-model'] == 'Basic') {
$publicTrafficDesc.find('#for_basic_zone').css('display', 'inline');
$publicTrafficDesc.find('#for_advanced_zone').hide();
}
else { //args.data['network-model'] == 'Advanced'
$publicTrafficDesc.find('#for_advanced_zone').css('display', 'inline');
$publicTrafficDesc.find('#for_basic_zone').hide();
}
addPublicNetwork: function(args) {
var isShown;
var $publicTrafficDesc = $('.zone-wizard:visible').find('#add_zone_public_traffic_desc');
if(args.data['network-model'] == 'Basic') {
if(selectedNetworkOfferingHavingSG == true && selectedNetworkOfferingHavingEIP == true && selectedNetworkOfferingHavingELB == true) {
$('.conditional.elb').show();
@ -118,11 +109,17 @@
else {
$('.conditional.elb').hide();
isShown = false;
}
}
$publicTrafficDesc.find('#for_basic_zone').css('display', 'inline');
$publicTrafficDesc.find('#for_advanced_zone').hide();
}
else { //args.data['network-model'] == 'Advanced'
$('.conditional.elb').hide();
isShown = true;
isShown = true;
$publicTrafficDesc.find('#for_advanced_zone').css('display', 'inline');
$publicTrafficDesc.find('#for_basic_zone').hide();
}
return isShown;
},