You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by pr...@apache.org on 2012/11/29 01:01:18 UTC
[15/50] [abbrv] git commit: CLOUDSTACK-459: cloudstack UI - create
network offering dialog - show "Associate Public IP" checkbox only when
"Elastic IP" Checkbox is checked.
CLOUDSTACK-459: cloudstack UI - create network offering dialog - show "Associate Public IP" checkbox only when "Elastic IP" Checkbox is checked.
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/d15f5a75
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/d15f5a75
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/d15f5a75
Branch: refs/heads/api_refactoring
Commit: d15f5a7512a4f97bcb95c6c26f7af479e6289ab7
Parents: 2e3bedd
Author: Jessica Wang <je...@citrix.com>
Authored: Tue Nov 27 13:40:06 2012 -0800
Committer: Jessica Wang <je...@citrix.com>
Committed: Tue Nov 27 13:40:06 2012 -0800
----------------------------------------------------------------------
ui/scripts/configuration.js | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/d15f5a75/ui/scripts/configuration.js
----------------------------------------------------------------------
diff --git a/ui/scripts/configuration.js b/ui/scripts/configuration.js
index ca886c7..ef8376d 100644
--- a/ui/scripts/configuration.js
+++ b/ui/scripts/configuration.js
@@ -1327,16 +1327,24 @@
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')
&&(args.$form.find('.form-item[rel=\"guestIpType\"]').find('select').val() == 'Shared')) {
- args.$form.find('.form-item[rel=\"service.StaticNat.elasticIpCheckbox\"]').css('display', 'inline-block');
- args.$form.find('.form-item[rel=\"service.StaticNat.associatePublicIP\"]').css('display', 'inline-block');
+ args.$form.find('.form-item[rel=\"service.StaticNat.elasticIpCheckbox\"]').css('display', 'inline-block');
}
else {
args.$form.find('.form-item[rel=\"service.StaticNat.elasticIpCheckbox\"]').hide();
- args.$form.find('.form-item[rel=\"service.StaticNat.elasticIpCheckbox\"]').find('input[type=checkbox]').attr('checked', false);
+ args.$form.find('.form-item[rel=\"service.StaticNat.elasticIpCheckbox\"]').find('input[type=checkbox]').attr('checked', false);
+ }
+
+ //show Associate Public IP checkbox only when (1)StaticNat Service is checked (2)Service Provider is Netscaler (3)Guest IP Type is Shared (4) Elastic IP checkbox is checked
+ 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')
+ &&(args.$form.find('.form-item[rel=\"guestIpType\"]').find('select').val() == 'Shared')
+ &&(args.$form.find('.form-item[rel=\"service.StaticNat.elasticIpCheckbox\"]').find('input[type=checkbox]').attr('checked') == "checked")) {
+ args.$form.find('.form-item[rel=\"service.StaticNat.associatePublicIP\"]').css('display', 'inline-block');
+ }
+ else {
args.$form.find('.form-item[rel=\"service.StaticNat.associatePublicIP\"]').hide();
args.$form.find('.form-item[rel=\"service.StaticNat.associatePublicIP\"]').find('input[type=checkbox]').attr('checked',false);
- }
-
+ }
});
args.$form.change();