apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

bug 12231: system - guest network - detail tab - split VLAN into 2 fields: start VLAN, end VLAN.

Browse Source
This commit is contained in:
Jessica Wang 2011-12-07 17:57:29 -08:00
parent 787bb5a9c4
commit 04c7bb7518
1 changed files with 37 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
ui/scripts/system.js
View File

@ -259,9 +259,15 @@
selectedZoneObj = json.updatezoneresponse.zone; //override selectedZoneObj after update zone selectedZoneObj = json.updatezoneresponse.zone; //override selectedZoneObj after update zone
} }
}); });
var vlan;
if(args.data.endVlan == null || args.data.endVlan.length == 0)
vlan = args.data.startVlan;
else
vlan = args.data.startVlan + "-" + args.data.endVlan;
$.ajax({ $.ajax({
url: createURL("updatePhysicalNetwork&id=" + selectedPhysicalNetworkObj.id + "&vlan=" + todb(args.data.vlan)), url: createURL("updatePhysicalNetwork&id=" + selectedPhysicalNetworkObj.id + "&vlan=" + todb(vlan)),
dataType: "json", dataType: "json",
success: function(json) { success: function(json) {
var jobId = json.updatephysicalnetworkresponse.jobid; var jobId = json.updatephysicalnetworkresponse.jobid;
@ -291,10 +297,22 @@
{ {
id: { label: 'ID' }, id: { label: 'ID' },
state: { label: 'State' }, state: { label: 'State' },
/*
vlan: { vlan: {
label: 'VLAN', label: 'VLAN',
isEditable: true isEditable: true
}, },
*/
startVlan: {
label: 'Start Vlan',
isEditable: true
},
endVlan: {
label: 'End Vlan',
isEditable: true
},
broadcastdomainrange: { label: 'Broadcast domain range' }, broadcastdomainrange: { label: 'Broadcast domain range' },
zoneid: { label: 'Zone ID' }, zoneid: { label: 'Zone ID' },
guestcidraddress: { guestcidraddress: {
@ -305,6 +323,23 @@
], ],
dataProvider: function(args) { dataProvider: function(args) {
selectedPhysicalNetworkObj["guestcidraddress"] = selectedZoneObj.guestcidraddress; selectedPhysicalNetworkObj["guestcidraddress"] = selectedZoneObj.guestcidraddress;
var startVlan, endVlan;
var vlan = selectedPhysicalNetworkObj.vlan;
if(vlan != null && vlan.length > 0) {
if(vlan.indexOf("-") != -1) {
var vlanArray = vlan.split("-");
startVlan = vlanArray[0];
endVlan = vlanArray[1];
}
else {
startVlan = vlan;
}
selectedPhysicalNetworkObj["startVlan"] = startVlan;
selectedPhysicalNetworkObj["endVlan"] = endVlan;
}
args.response.success({ args.response.success({
actionFilter: function() { actionFilter: function() {
var allowedActions = []; var allowedActions = [];