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

bug 13628: add zone wizard - show different description of public traffic, guest traffic for basic zone and advanced zone.

Browse Source
This commit is contained in:
Jessica Wang 2012-02-17 11:42:17 -08:00
parent d3cc43e83f
commit 6bbe637e84
1 changed files with 21 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
ui/scripts/zoneWizard.js
View File

@ -10,24 +10,20 @@
publicTrafficIPRange: function(args) { publicTrafficIPRange: function(args) {
var multiEditData = []; var multiEditData = [];
var totalIndex = 0; var totalIndex = 0;
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();
}
return $('<div>').multiEdit({ return $('<div>').multiEdit({
context: args.context, context: args.context,
noSelect: true, noSelect: true,
preFilter: function(args) { //Brian, preFilter doesn't get picked up here
var $publicTrafficDesc = $("#add_zone_public_traffic_desc");
//debugger;
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();
}
},
fields: { fields: {
'gateway': { edit: true, label: 'label.gateway' }, 'gateway': { edit: true, label: 'label.gateway' },
'netmask': { edit: true, label: 'label.netmask' }, 'netmask': { edit: true, label: 'label.netmask' },
@ -382,16 +378,15 @@
guestTraffic: { guestTraffic: {
preFilter: function(args) { preFilter: function(args) {
var $guestTrafficDesc = $("#add_zone_guest_traffic_desc"); var $guestTrafficDesc = $('.zone-wizard:visible').find('#add_zone_guest_traffic_desc');
//debugger; //Brian, please take a look here if (args.data['network-model'] == 'Basic') {
if (args.data['network-model'] == 'Basic') { $guestTrafficDesc.find('#for_basic_zone').css('display', 'inline');
$guestTrafficDesc.find("#for_basic_zone").css('display', 'inline'); $guestTrafficDesc.find('#for_advanced_zone').hide();
$guestTrafficDesc.find("#for_advanced_zone").hide(); }
} else { //args.data['network-model'] == 'Advanced'
else { //args.data['network-model'] == 'Advanced' $guestTrafficDesc.find('#for_advanced_zone').css('display', 'inline');
$guestTrafficDesc.find("#for_advanced_zone").css('display', 'inline'); $guestTrafficDesc.find('#for_basic_zone').hide();
$guestTrafficDesc.find("#for_basic_zone").hide(); }
}
var selectedZoneObj = { var selectedZoneObj = {
networktype: args.data['network-model'] networktype: args.data['network-model']