Updated Branches: refs/heads/master e6c3e59e3 -> 7d15dc1d4
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. Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/7d15dc1d Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/7d15dc1d Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/7d15dc1d Branch: refs/heads/master Commit: 7d15dc1d4dba908eb4a42d5d65bac2508881efc5 Parents: e6c3e59 Author: Jessica Wang <[email protected]> Authored: Thu Oct 25 15:57:27 2012 -0700 Committer: Jessica Wang <[email protected]> Committed: Thu Oct 25 15:59:54 2012 -0700 ---------------------------------------------------------------------- ui/scripts/configuration.js | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/7d15dc1d/ui/scripts/configuration.js ---------------------------------------------------------------------- diff --git a/ui/scripts/configuration.js b/ui/scripts/configuration.js index 7d1d1dd..6b41cb9 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';
