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

CLOUDSTACK-542: cloudtack UI - create network offering dialog - hide NetworkACL service field when Guest Type is selected as Shared.

Browse Source
This commit is contained in:
Jessica Wang 2012-11-26 15:26:15 -08:00
parent 08bd175d56
commit c0d39ebbfe
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ui/scripts/configuration.js
View File

@ -1211,7 +1211,7 @@
//CS-16612 show all services regardless of guestIpType(Shared/Isolated) //CS-16612 show all services regardless of guestIpType(Shared/Isolated)
/* /*
//hide/show service fields upon guestIpType(Shared/Isolated), having VpcVirtualRouter or not ***** (begin) ***** //hide/show service fields ***** (begin) *****
var serviceFieldsToHide = []; var serviceFieldsToHide = [];
if($guestTypeField.val() == 'Shared') { //Shared network offering if($guestTypeField.val() == 'Shared') { //Shared network offering
serviceFieldsToHide = [ serviceFieldsToHide = [
@ -1248,7 +1248,21 @@
serviceFieldsToHide = temp; serviceFieldsToHide = temp;
} }
} }
*/
//CS-16687: NetworkACL should be removed when the guest_type is SHARED
//hide/show service fields ***** (begin) *****
var serviceFieldsToHide = [];
if($guestTypeField.val() == 'Shared') { //Shared network offering
serviceFieldsToHide = [
'service.NetworkACL.isEnabled'
];
}
else { //Isolated network offering
serviceFieldsToHide = [];
}
//hide service fields that are included in serviceFieldsToHide //hide service fields that are included in serviceFieldsToHide
var $serviceCheckboxesToHide = args.$form.find('.form-item').filter(function() { var $serviceCheckboxesToHide = args.$form.find('.form-item').filter(function() {
if ($.inArray($(this).attr('rel'), serviceFieldsToHide) > -1) { if ($.inArray($(this).attr('rel'), serviceFieldsToHide) > -1) {
@ -1276,9 +1290,8 @@
} }
} }
} }
//hide/show service fields upon guestIpType(Shared/Isolated), having VpcVirtualRouter or not ***** (end) ***** //hide/show service fields ***** (end) *****
*/
//show LB InlineMode dropdown only when (1)LB Service is checked (2)Service Provider is F5 //show LB InlineMode dropdown only when (1)LB Service is checked (2)Service Provider is F5
if((args.$form.find('.form-item[rel=\"service.Lb.isEnabled\"]').find('input[type=checkbox]').is(':checked') == true) if((args.$form.find('.form-item[rel=\"service.Lb.isEnabled\"]').find('input[type=checkbox]').is(':checked') == true)