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

cloudStack 3.0 new UI - naas - display VLAN for isolated network.

Browse Source
This commit is contained in:
Jessica Wang 2011-11-30 16:40:05 -08:00
parent f3df18aa9b
commit 206786038f
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ui/scripts/system.js
View File

@ -317,12 +317,9 @@
id: 'networks',
fields: {
name: { label: 'Name' },
vlan: { label: 'VLAN' },
type: { label: 'Type' },
networkofferingdisplaytext: { label: 'Network offering' },
isdefault: {
label: 'Default',
converter: cloudStack.converters.toBooleanText
}
account: { label: 'Account' }
},
actions: {
add: {
@ -827,6 +824,7 @@
hiddenFields.push("startip");
hiddenFields.push("endip");
}
if(selectedGuestNetworkObj.type == "Isolated") {
hiddenFields.push("networkofferingdisplaytext");
hiddenFields.push("networkdomaintext");
@ -834,8 +832,7 @@
else {
hiddenFields.push("networkofferingid");
hiddenFields.push("networkdomain");
}
}
return hiddenFields;
},
fields: [
@ -906,7 +903,12 @@
],
dataProvider: function(args) {
selectedGuestNetworkObj = args.context.networks[0];
selectedGuestNetworkObj["networkdomaintext"] = selectedGuestNetworkObj.networkdomain;
selectedGuestNetworkObj["networkdomaintext"] = selectedGuestNetworkObj.networkdomain;
if(selectedGuestNetworkObj.vlan == null && selectedGuestNetworkObj.broadcasturi != null)
selectedGuestNetworkObj["vlan"] = selectedGuestNetworkObj.broadcasturi.replace("vlan://", "");
args.response.success({data: selectedGuestNetworkObj});
}
},