Updated Branches: refs/heads/master 9547a2f86 -> 4cb08a3d3
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 Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/4cb08a3d Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/4cb08a3d Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/4cb08a3d Branch: refs/heads/master Commit: 4cb08a3d371622f0252b1369a55bddd2a66915ba Parents: 9547a2f Author: Pranav Saxena <[email protected]> Authored: Fri Nov 9 00:44:53 2012 +0530 Committer: Pranav Saxena <[email protected]> Committed: Fri Nov 9 00:44:53 2012 +0530 ---------------------------------------------------------------------- ui/scripts/configuration.js | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/4cb08a3d/ui/scripts/configuration.js ---------------------------------------------------------------------- diff --git a/ui/scripts/configuration.js b/ui/scripts/configuration.js index 83901ee..5c33e4f 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',
