You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by je...@apache.org on 2013/01/19 01:04:51 UTC
git commit: CLOUDSTACK-652: cloudstack UI - create network offering
dialog - for both Isolated network and Shared network,
show Elastic IP dropdown when StaticNAT is checked and StaticNAT provider is
Netscaler.
Updated Branches:
refs/heads/master d13d67bdd -> 98a289020
CLOUDSTACK-652: cloudstack UI - create network offering dialog - for both Isolated network and Shared network, show Elastic IP dropdown when StaticNAT is checked and StaticNAT provider is Netscaler.
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/98a28902
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/98a28902
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/98a28902
Branch: refs/heads/master
Commit: 98a289020faab3b6e8825aeb7d924c6493c66548
Parents: d13d67b
Author: Jessica Wang <je...@citrix.com>
Authored: Fri Jan 18 16:03:33 2013 -0800
Committer: Jessica Wang <je...@citrix.com>
Committed: Fri Jan 18 16:03:33 2013 -0800
----------------------------------------------------------------------
ui/scripts/configuration.js | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/98a28902/ui/scripts/configuration.js
----------------------------------------------------------------------
diff --git a/ui/scripts/configuration.js b/ui/scripts/configuration.js
index 30c850f..0fbea2d 100644
--- a/ui/scripts/configuration.js
+++ b/ui/scripts/configuration.js
@@ -1325,10 +1325,10 @@
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
+ //show Elastic IP checkbox only when (1)StaticNat service is checked (2)StaticNat service provider is Netscaler
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');
}
else {