From 4cb08a3d371622f0252b1369a55bddd2a66915ba Mon Sep 17 00:00:00 2001 From: Pranav Saxena Date: Fri, 9 Nov 2012 00:44:53 +0530 Subject: [PATCH] CLOUDSTACK-459:[Optional Public IP assignment for EIP with Basic Zone] Associate IP Checkbox in Create Network Offering Dialog is Displayed When Elastic LB is Selected --- ui/scripts/configuration.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/ui/scripts/configuration.js b/ui/scripts/configuration.js index 83901eeb712..5c33e4f4ae5 100644 --- a/ui/scripts/configuration.js +++ b/ui/scripts/configuration.js @@ -1290,11 +1290,15 @@ 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.elasticLbCheckbox\"]').css('display', 'inline-block'); + args.$form.find('.form-item[rel=\"associatePublicIP\"]').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); + args.$form.find('.form-item[rel=\"associatePublicIP\"]').hide(); + args.$form.find('.form-item[rel=\"service.Lb.elasticLbCheckbox\"]').find('input[type=checkbox]').attr('checked', false); + args.$form.find('.form-item[rel=\"associatePublicIP\"]').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 @@ -1564,7 +1568,7 @@ label: 'Associate IP', isBoolean: true, isHidden: true, - dependsOn: 'service.Lb.elasticLbCheckbox' + // dependsOn: 'service.Lb.elasticLbCheckbox' }, "service.Lb.lbIsolationDropdown": { label: 'label.LB.isolation',