You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by mu...@apache.org on 2012/12/06 09:09:10 UTC
[25/100] [abbrv] git commit: CS-16777: cloudstack UI - create network
offering dialog - Associate IP checkbox should show when elastic IP (NOT
elastic LB) is selected.
CS-16777: cloudstack UI - create network offering dialog - Associate IP checkbox should show when elastic IP (NOT 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/442fff1d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/442fff1d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/442fff1d
Branch: refs/heads/events-framework
Commit: 442fff1dfdd58a22a59290055d622aea5a72d6e8
Parents: 2f27746
Author: Jessica Wang <je...@citrix.com>
Authored: Mon Nov 12 16:39:46 2012 -0800
Committer: Jessica Wang <je...@citrix.com>
Committed: Tue Nov 13 10:20:08 2012 -0800
----------------------------------------------------------------------
ui/scripts/configuration.js | 34 +++++++++++++++++-----------------
1 files changed, 17 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/442fff1d/ui/scripts/configuration.js
----------------------------------------------------------------------
diff --git a/ui/scripts/configuration.js b/ui/scripts/configuration.js
index 5c33e4f..4d1e19d 100644
--- a/ui/scripts/configuration.js
+++ b/ui/scripts/configuration.js
@@ -1290,26 +1290,25 @@
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=\"associatePublicIP\"]').css('display', 'inline-block');
+ 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=\"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);
-
+ 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')
&&(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.elasticIpCheckbox\"]').css('display', 'inline-block');
+ args.$form.find('.form-item[rel=\"associatePublicIP\"]').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);
+ args.$form.find('.form-item[rel=\"associatePublicIP\"]').hide();
+ args.$form.find('.form-item[rel=\"associatePublicIP\"]').find('input[type=checkbox]').attr('checked',false);
}
});
@@ -1559,17 +1558,12 @@
});
}
},
+
"service.Lb.elasticLbCheckbox" : {
label: "label.elastic.LB",
isHidden: true,
isBoolean: true
- },
- associatePublicIP: {
- label: 'Associate IP',
- isBoolean: true,
- isHidden: true,
- // dependsOn: 'service.Lb.elasticLbCheckbox'
- },
+ },
"service.Lb.lbIsolationDropdown": {
label: 'label.LB.isolation',
isHidden: true,
@@ -1590,12 +1584,18 @@
items.push({id: "true", description: "inline"});
args.response.success({data: items});
}
- },
+ },
+
"service.StaticNat.elasticIpCheckbox" : {
label: "label.elastic.IP",
isHidden: true,
isBoolean: true
},
+ "associatePublicIP": {
+ label: 'Associate IP',
+ isBoolean: true,
+ isHidden: true
+ },
//show or hide upon checked services and selected providers above (end)