mirror of
https://github.com/apache/cloudstack.git
synced 2025-10-26 08:42:29 +01:00
bug 13628: add zone wizard - show different description of public traffic, guest traffic for basic zone and advanced zone.
This commit is contained in:
parent
d3cc43e83f
commit
6bbe637e84
@ -10,24 +10,20 @@
|
||||
publicTrafficIPRange: function(args) {
|
||||
var multiEditData = [];
|
||||
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({
|
||||
context: args.context,
|
||||
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();
|
||||
}
|
||||
},
|
||||
|
||||
noSelect: true,
|
||||
fields: {
|
||||
'gateway': { edit: true, label: 'label.gateway' },
|
||||
'netmask': { edit: true, label: 'label.netmask' },
|
||||
@ -382,16 +378,15 @@
|
||||
|
||||
guestTraffic: {
|
||||
preFilter: function(args) {
|
||||
var $guestTrafficDesc = $("#add_zone_guest_traffic_desc");
|
||||
//debugger; //Brian, please take a look here
|
||||
if (args.data['network-model'] == 'Basic') {
|
||||
$guestTrafficDesc.find("#for_basic_zone").css('display', 'inline');
|
||||
$guestTrafficDesc.find("#for_advanced_zone").hide();
|
||||
}
|
||||
else { //args.data['network-model'] == 'Advanced'
|
||||
$guestTrafficDesc.find("#for_advanced_zone").css('display', 'inline');
|
||||
$guestTrafficDesc.find("#for_basic_zone").hide();
|
||||
}
|
||||
var $guestTrafficDesc = $('.zone-wizard:visible').find('#add_zone_guest_traffic_desc');
|
||||
if (args.data['network-model'] == 'Basic') {
|
||||
$guestTrafficDesc.find('#for_basic_zone').css('display', 'inline');
|
||||
$guestTrafficDesc.find('#for_advanced_zone').hide();
|
||||
}
|
||||
else { //args.data['network-model'] == 'Advanced'
|
||||
$guestTrafficDesc.find('#for_advanced_zone').css('display', 'inline');
|
||||
$guestTrafficDesc.find('#for_basic_zone').hide();
|
||||
}
|
||||
|
||||
var selectedZoneObj = {
|
||||
networktype: args.data['network-model']
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user