etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.

This commit is contained in:
Jessica Wang 2012-10-25 15:57:27 -07:00
parent e6c3e59e39
commit 7d15dc1d4d
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ui/scripts/configuration.js
View File

@ -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';