apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-03 04:12:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

salmon - network offering - change ID to append "service.xxx." for fields that shows/hides upon services selected.

Browse Source
This commit is contained in:
Jessica Wang 2012-01-19 14:09:19 -08:00
parent d92c361efd
commit 19002a2434
1 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
ui/scripts/configuration.js
View File

@ -1043,21 +1043,24 @@
serviceProviderMap[serviceData[1]] = formData[ serviceProviderMap[serviceData[1]] = formData[
'service.' + serviceData[1] + '.provider' 'service.' + serviceData[1] + '.provider'
]; ];
} else if (serviceData[0] == 'service' && }
serviceData[2].indexOf('Capability') != -1 && else if (serviceData[0] == 'service' &&
value == 'on') { // Services field serviceData[2].indexOf('Capability') != -1 &&
value == 'on') { // Services field
serviceCapabilityMap[serviceData[1]] = serviceData[2]; serviceCapabilityMap[serviceData[1]] = serviceData[2];
} }
} else if ((key == 'lbIsolation') && ("Lb" in serviceProviderMap)) { else if ((key == 'service.Lb.lbIsolationDropdown') && ("Lb" in serviceProviderMap)) {
inputData['servicecapabilitylist[0].service'] = 'lb'; inputData['servicecapabilitylist[0].service'] = 'lb';
inputData['servicecapabilitylist[0].capabilitytype'] = 'SupportedLbIsolation'; inputData['servicecapabilitylist[0].capabilitytype'] = 'SupportedLbIsolation';
inputData['servicecapabilitylist[0].capabilityvalue'] = value; inputData['servicecapabilitylist[0].capabilityvalue'] = value;
} else if ((key == 'sourceNatType') && ("SourceNat" in serviceProviderMap)) { }
inputData['servicecapabilitylist[0].service'] = 'sourcenat'; else if ((key == 'service.SourceNat.sourceNatTypeDropdown') && ("SourceNat" in serviceProviderMap)) {
inputData['servicecapabilitylist[0].capabilitytype'] = 'SupportedSourceNatTypes'; inputData['servicecapabilitylist[0].service'] = 'sourcenat';
inputData['servicecapabilitylist[0].capabilityvalue'] = value; inputData['servicecapabilitylist[0].capabilitytype'] = 'SupportedSourceNatTypes';
} else if (value != '') { // Normal data inputData['servicecapabilitylist[0].capabilityvalue'] = value;
}
}
else if (value != '') { // Normal data
inputData[key] = value; inputData[key] = value;
} }
}); });
@ -1088,9 +1091,9 @@
}); });
var serviceCapabilityIndex = 0; var serviceCapabilityIndex = 0;
$.each(serviceCapabilityMap, function(key, value) { $.each(serviceCapabilityMap, function(key, value) {
var capabilityType = null; var capabilityType = null;
if(value == "redundantRouterCapability") if(value == "redundantRouterCapabilityCheckbox")
capabilityType = "RedundantRouter"; capabilityType = "RedundantRouter";
if(capabilityType != null) { if(capabilityType != null) {
inputData['serviceCapabilityList[' + serviceCapabilityIndex + '].service'] = key; inputData['serviceCapabilityList[' + serviceCapabilityIndex + '].service'] = key;
@ -1248,14 +1251,14 @@
} }
}, },
"service.SourceNat.redundantRouterCapability" : { "service.SourceNat.redundantRouterCapabilityCheckbox" : {
label: "Redundant router capability", label: "Redundant router capability",
isHidden: true, isHidden: true,
dependsOn: 'service.SourceNat.isEnabled', dependsOn: 'service.SourceNat.isEnabled',
isBoolean: true, isBoolean: true,
}, },
sourceNatType: { "service.SourceNat.sourceNatTypeDropdown": {
label: 'Supported Source NAT type', label: 'Supported Source NAT type',
isHidden: true, isHidden: true,
dependsOn: 'service.SourceNat.isEnabled', dependsOn: 'service.SourceNat.isEnabled',
@ -1269,7 +1272,7 @@
} }
}, },
lbIsolation: { "service.Lb.lbIsolationDropdown": {
label: 'LB isolation', label: 'LB isolation',
isHidden: true, isHidden: true,
dependsOn: 'service.Lb.isEnabled', dependsOn: 'service.Lb.isEnabled',