From c1b746a4f1bfc0a09d7979c7470f57a1f92c4af0 Mon Sep 17 00:00:00 2001 From: Pranav Saxena Date: Tue, 31 Jul 2012 16:38:33 +0530 Subject: [PATCH] CS-15770:Dedicated option should not be displayed when Basic EIP/ELB is chosen as Network Offering --- ui/scripts/zoneWizard.js | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/ui/scripts/zoneWizard.js b/ui/scripts/zoneWizard.js index e9be9776aa6..e7d8fa77d91 100644 --- a/ui/scripts/zoneWizard.js +++ b/ui/scripts/zoneWizard.js @@ -545,7 +545,17 @@ }, basicPhysicalNetwork: { //"Netscaler" now - preFilter: cloudStack.preFilter.addLoadBalancerDevice, + preFilter: cloudStack.preFilter.addLoadBalancerDevice, + //Handling the hiding of "dedicated" option + 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'