From d269947641ad4fc28fa7333bf755c89e85cee808 Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Tue, 8 May 2012 17:09:19 -0700 Subject: [PATCH] CS-14815: cloudstack 3.0 UI - add network offering - show LB Isolation dropdown only when (1)LB Service is checked (2)Service Provider is Netscaler OR F5 (3)Guest IP Type is Isolated --- ui/scripts/configuration.js | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/ui/scripts/configuration.js b/ui/scripts/configuration.js index cda50b69c5e..a9fc227f38a 100644 --- a/ui/scripts/configuration.js +++ b/ui/scripts/configuration.js @@ -1131,20 +1131,28 @@ //hide/show service fields upon guestIpType(Shared/Isolated) and zoneType(Advanced/Basic) ***** (end) ***** - //show Elastic LB checkbox, LB Isolation dropdown only when (1)LB Service is checked (2)Service Provider is Netscaler (3)Guest IP Type is Shared + //show LB Isolation dropdown only when (1)LB Service is checked (2)Service Provider is Netscaler OR F5 (3)Guest IP Type is Isolated if((args.$form.find('.form-item[rel=\"service.Lb.isEnabled\"]').find('input[type=checkbox]').is(':checked') == true) - &&(args.$form.find('.form-item[rel=\"service.Lb.provider\"]').find('select').val() == 'Netscaler') - &&(args.$form.find('.form-item[rel=\"guestIpType\"]').find('select').val() == 'Shared')) { - args.$form.find('.form-item[rel=\"service.Lb.elasticLbCheckbox\"]').css('display', 'inline-block'); + &&(args.$form.find('.form-item[rel=\"service.Lb.provider\"]').find('select').val() == 'Netscaler' + || args.$form.find('.form-item[rel=\"service.Lb.provider\"]').find('select').val() == 'F5BigIp') + &&(args.$form.find('.form-item[rel=\"guestIpType\"]').find('select').val() == 'Isolated')) { args.$form.find('.form-item[rel=\"service.Lb.lbIsolationDropdown\"]').css('display', 'inline-block'); } - else { - args.$form.find('.form-item[rel=\"service.Lb.elasticLbCheckbox\"]').hide(); - args.$form.find('.form-item[rel=\"service.Lb.elasticLbCheckbox\"]').find('input[type=checkbox]').attr('checked', false); + else { args.$form.find('.form-item[rel=\"service.Lb.lbIsolationDropdown\"]').hide(); } - + //show Elastic LB checkbox only when (1)LB Service is checked (2)Service Provider is Netscaler (3)Guest IP Type is Shared + if((args.$form.find('.form-item[rel=\"service.Lb.isEnabled\"]').find('input[type=checkbox]').is(':checked') == true) + &&(args.$form.find('.form-item[rel=\"service.Lb.provider\"]').find('select').val() == 'Netscaler') + &&(args.$form.find('.form-item[rel=\"guestIpType\"]').find('select').val() == 'Shared')) { + args.$form.find('.form-item[rel=\"service.Lb.elasticLbCheckbox\"]').css('display', 'inline-block'); + } + else { + args.$form.find('.form-item[rel=\"service.Lb.elasticLbCheckbox\"]').hide(); + args.$form.find('.form-item[rel=\"service.Lb.elasticLbCheckbox\"]').find('input[type=checkbox]').attr('checked', false); + } + //show Elastic IP checkbox only when (1)StaticNat Service is checked (2)Service Provider is Netscaler (3)Guest IP Type is Shared if((args.$form.find('.form-item[rel=\"service.StaticNat.isEnabled\"]').find('input[type=checkbox]').is(':checked') == true) &&(args.$form.find('.form-item[rel=\"service.StaticNat.provider\"]').find('select').val() == 'Netscaler')