From 7d15dc1d4dba908eb4a42d5d65bac2508881efc5 Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Thu, 25 Oct 2012 15:57:27 -0700 Subject: [PATCH] CS-16605: cloudstack 3.0 UI - create network offering - Mode dropdown (side by side/inline) - do not pass capabilitytype=InlineMode to API call when "side by side" is selected. Only pass it when "inline" is selected. --- ui/scripts/configuration.js | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/ui/scripts/configuration.js b/ui/scripts/configuration.js index 7d1d1dd8162..6b41cb995a6 100644 --- a/ui/scripts/configuration.js +++ b/ui/scripts/configuration.js @@ -1620,11 +1620,13 @@ inputData['servicecapabilitylist[' + serviceCapabilityIndex + '].capabilityvalue'] = true; //because this checkbox's value == "on" serviceCapabilityIndex++; } - else if ((key == 'service.Lb.inlineModeDropdown') && ("Lb" in serviceProviderMap) && (serviceProviderMap.Lb == "F5BigIp")) { - inputData['servicecapabilitylist[' + serviceCapabilityIndex + '].service'] = 'lb'; - inputData['servicecapabilitylist[' + serviceCapabilityIndex + '].capabilitytype'] = 'InlineMode'; - inputData['servicecapabilitylist[' + serviceCapabilityIndex + '].capabilityvalue'] = value; - serviceCapabilityIndex++; + else if ((key == 'service.Lb.inlineModeDropdown') && ("Lb" in serviceProviderMap) && (serviceProviderMap.Lb == "F5BigIp")) { + if(value == 'true') { //CS-16605 do not pass parameter if value is 'false'(side by side) + inputData['servicecapabilitylist[' + serviceCapabilityIndex + '].service'] = 'lb'; + inputData['servicecapabilitylist[' + serviceCapabilityIndex + '].capabilitytype'] = 'InlineMode'; + inputData['servicecapabilitylist[' + serviceCapabilityIndex + '].capabilityvalue'] = value; + serviceCapabilityIndex++; + } } else if ((key == 'service.Lb.lbIsolationDropdown') && ("Lb" in serviceProviderMap)) { inputData['servicecapabilitylist[' + serviceCapabilityIndex + '].service'] = 'lb';