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

CS-15807 :No network label for OVM is available in UI

This commit is contained in:
Pranav Saxena 2012-08-02 13:48:13 +05:30
parent dd4e19c16f
commit 0f302f9e42
1 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
ui/scripts/system.js
View File

@ -115,7 +115,9 @@
trafficType.kvmnetworklabel = dictionary['label.network.label.display.for.blank.value'];
if(trafficType.vmwarenetworklabel == null || trafficType.vmwarenetworklabel == 0)
trafficType.vmwarenetworklabel = dictionary['label.network.label.display.for.blank.value'];
if(trafficType.ovmnetworklabel == null || trafficType.ovmnetworklabel == 0)
trafficType.ovmnetworklabel = dictionary['label.network.label.display.for.blank.value'];
return trafficType;
};
@ -127,7 +129,8 @@
array1.push("&kvmnetworklabel=" + labels.kvmnetworklabel);
if(labels.vmwarenetworklabel != dictionary['label.network.label.display.for.blank.value'])
array1.push("&vmwarenetworklabel=" + labels.vmwarenetworklabel);
if(labels.ovmnetworklabel != dictionary['label.network.label.display.for.blank.value'])
array1.push("&ovmnetworklabel=" + labels.ovmnetworklabel);
$.ajax({
url: createURL('updateTrafficType' + array1.join("")),
data: {
@ -404,7 +407,8 @@
{
xennetworklabel: { label: 'label.xen.traffic.label', isEditable: true },
kvmnetworklabel: { label: 'label.kvm.traffic.label', isEditable: true },
vmwarenetworklabel: { label: 'label.vmware.traffic.label', isEditable: true }
vmwarenetworklabel: { label: 'label.vmware.traffic.label', isEditable: true },
ovmnetworklabel: { label: 'OVM traffic label',isEditable:true}
}
],
@ -423,6 +427,7 @@
selectedPublicNetworkObj.xennetworklabel = trafficType.xennetworklabel;
selectedPublicNetworkObj.kvmnetworklabel = trafficType.kvmnetworklabel;
selectedPublicNetworkObj.vmwarenetworklabel = trafficType.vmwarenetworklabel;
selectedPublicNetworkObj.ovmnetworklabel = trafficType.ovmnetworklabel;
args.response.success({data: selectedPublicNetworkObj});
}
@ -575,7 +580,9 @@
{
xennetworklabel: { label: 'label.xen.traffic.label', isEditable: true },
kvmnetworklabel: { label: 'label.kvm.traffic.label', isEditable: true },
vmwarenetworklabel: { label: 'label.vmware.traffic.label', isEditable: true }
vmwarenetworklabel: { label: 'label.vmware.traffic.label', isEditable: true },
ovmnetworklabel: { label: 'OVM traffic label', isEditable: true }
}
],
@ -592,7 +599,7 @@
selectedPublicNetworkObj.xennetworklabel = trafficType.xennetworklabel;
selectedPublicNetworkObj.kvmnetworklabel = trafficType.kvmnetworklabel;
selectedPublicNetworkObj.vmwarenetworklabel = trafficType.vmwarenetworklabel;
selectedPublicNetworkObj.ovmnetworklabel = trafficType.ovmnetworklabel;
args.response.success({data: selectedPublicNetworkObj});
}
});
@ -732,7 +739,9 @@
{
xennetworklabel: { label: 'label.xen.traffic.label', isEditable: true },
kvmnetworklabel: { label: 'label.kvm.traffic.label', isEditable: true },
vmwarenetworklabel: { label: 'label.vmware.traffic.label', isEditable: true }
vmwarenetworklabel: { label: 'label.vmware.traffic.label', isEditable: true },
ovmnetworklabel: { label: 'OVM traffic label', isEditable: true }
}
],
dataProvider: function(args) {
@ -747,7 +756,7 @@
selectedManagementNetworkObj.xennetworklabel = trafficType.xennetworklabel;
selectedManagementNetworkObj.kvmnetworklabel = trafficType.kvmnetworklabel;
selectedManagementNetworkObj.vmwarenetworklabel = trafficType.vmwarenetworklabel;
selectedManagementNetworkObj.ovmnetworklabel = trafficType.ovmnetworklabel;
args.response.success({ data: selectedManagementNetworkObj });
}
});
@ -864,7 +873,8 @@
{ //updateTrafficType API
xennetworklabel: { label: 'label.xen.traffic.label', isEditable: true },
kvmnetworklabel: { label: 'label.kvm.traffic.label', isEditable: true },
vmwarenetworklabel: { label: 'label.vmware.traffic.label', isEditable: true }
vmwarenetworklabel: { label: 'label.vmware.traffic.label', isEditable: true },
ovmnetworklabel: { label: 'OVM traffic label', isEditable: true }
}
],
dataProvider: function(args) { //physical network + Guest traffic type
@ -899,7 +909,7 @@
selectedPhysicalNetworkObj["xennetworklabel"] = trafficType.xennetworklabel;
selectedPhysicalNetworkObj["kvmnetworklabel"] = trafficType.kvmnetworklabel;
selectedPhysicalNetworkObj["vmwarenetworklabel"] = trafficType.vmwarenetworklabel;
selectedPhysicalNetworkObj["ovmnetworklabel"] = trafficType.ovmnetworklabel;
args.response.success({
actionFilter: function() {
var allowedActions = ['edit'];