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

bug 13099: system - traffic type detail page - display "Use default gateway" when network label is blank.

This commit is contained in:
Jessica Wang 2012-02-10 13:05:05 -08:00
parent ef6e0daddb
commit 277cb5633e
1 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
ui/scripts/system.js
View File

@ -4,7 +4,8 @@
var selectedClusterObj, selectedZoneObj, selectedPublicNetworkObj, selectedManagementNetworkObj, selectedPhysicalNetworkObj, selectedGuestNetworkObj;
var naasStatusMap = {};
var nspMap = {};
var networklabelDisplayForBlankValue = "Use default gateway";
var getTrafficType = function(physicalNetwork, typeID) {
var trafficType = {};
@ -24,17 +25,29 @@
}
});
if(trafficType.xennetworklabel == null || trafficType.xennetworklabel == 0)
trafficType.xennetworklabel = networklabelDisplayForBlankValue;
if(trafficType.kvmnetworklabel == null || trafficType.kvmnetworklabel == 0)
trafficType.kvmnetworklabel = networklabelDisplayForBlankValue;
if(trafficType.vmwarenetworklabel == null || trafficType.vmwarenetworklabel == 0)
trafficType.vmwarenetworklabel = networklabelDisplayForBlankValue;
return trafficType;
};
var updateTrafficLabels = function(trafficType, labels, complete) {
$.ajax({
url: createURL('updateTrafficType'),
var array1 = [];
if(labels.xennetworklabel != networklabelDisplayForBlankValue)
array1.push("&xennetworklabel=" + labels.xennetworklabel);
if(labels.kvmnetworklabel != networklabelDisplayForBlankValue)
array1.push("&kvmnetworklabel=" + labels.kvmnetworklabel);
if(labels.vmwarenetworklabel != networklabelDisplayForBlankValue)
array1.push("&vmwarenetworklabel=" + labels.vmwarenetworklabel);
$.ajax({
url: createURL('updateTrafficType' + array1.join("")),
data: {
id: trafficType.id,
xennetworklabel: labels.xennetworklabel,
kvmnetworklabel: labels.kvmnetworklabel,
vmwarenetworklabel: labels.vmwarenetworklabel
id: trafficType.id
},
success: function(json) {
var jobID = json.updatetraffictyperesponse.jobid;