mirror of https://github.com/apache/cloudstack.git
cloudstack 3.0 new UI - add zone wizard - public traffic - show different description for basic zone and advanced zone.
This commit is contained in:
parent
f0e3cad6f9
commit
a56d465387
|
|
@ -577,7 +577,8 @@
|
|||
</ul>
|
||||
|
||||
<div class="info-desc" id="add_zone_public_traffic_desc">
|
||||
|
||||
<span id="for_basic_zone" style="display:none"><fmt:message key="message.public.traffic.in.basic.zone"/></span>
|
||||
<span id="for_advanced_zone" style="display:none"><fmt:message key="message.public.traffic.in.advanced.zone"/></span>
|
||||
</div>
|
||||
<div ui-custom="publicTrafficIPRange"></div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -14,6 +14,20 @@
|
|||
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();
|
||||
}
|
||||
},
|
||||
|
||||
fields: {
|
||||
'gateway': { edit: true, label: 'label.gateway' },
|
||||
'netmask': { edit: true, label: 'label.netmask' },
|
||||
|
|
@ -369,7 +383,7 @@
|
|||
guestTraffic: {
|
||||
preFilter: function(args) {
|
||||
var $guestTrafficDesc = $("#add_zone_guest_traffic_desc");
|
||||
//debugger;
|
||||
//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();
|
||||
|
|
|
|||
Loading…
Reference in New Issue