You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by al...@apache.org on 2012/07/31 22:40:02 UTC
[13/50] [abbrv] git commit: CS-15770: Hide Dedicated option when
Basic EIP/ELB is chosen as Network Offering.
CS-15770: Hide Dedicated option when Basic EIP/ELB is chosen as Network Offering.
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/05c9e0bb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/05c9e0bb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/05c9e0bb
Branch: refs/heads/vpc
Commit: 05c9e0bb36cc9606b50ddd9b682ad4c7b6f4b0aa
Parents: da0db63
Author: olgasmola <ol...@apache.org>
Authored: Tue Jul 31 13:35:41 2012 +0300
Committer: olgasmola <ol...@apache.org>
Committed: Tue Jul 31 13:35:41 2012 +0300
----------------------------------------------------------------------
ui/scripts/zoneWizard.js | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/05c9e0bb/ui/scripts/zoneWizard.js
----------------------------------------------------------------------
diff --git a/ui/scripts/zoneWizard.js b/ui/scripts/zoneWizard.js
index 92015bb..82f86ce 100644
--- a/ui/scripts/zoneWizard.js
+++ b/ui/scripts/zoneWizard.js
@@ -549,7 +549,14 @@
},
basicPhysicalNetwork: { //"Netscaler" now
- preFilter: cloudStack.preFilter.addLoadBalancerDevice,
+ preFilter: function(args) {
+ if (args.data['network-model'] == 'Basic' && (selectedNetworkOfferingHavingELB || selectedNetworkOfferingHavingEIP)) {
+ args.$form.find('[rel=dedicated]').hide();
+ } else {
+ args.$form.find('[rel=dedicated]').show();
+ };
+ cloudStack.preFilter.addLoadBalancerDevice
+ },
fields: {
ip: {
label: 'label.ip.address'