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

cloudstack 3.0 new UI - system - guest network - detailView - add scope including domain name and account name if there is.

This commit is contained in:
Jessica Wang 2011-12-15 18:27:45 -08:00
parent 96fa28aad6
commit 57dee1cb92
2 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui/scripts/sharedFunctions.js
View File

@ -28,6 +28,8 @@ var md5HashedLogin = false;
//page size for API call (e.g."listXXXXXXX&pagesize=N" )
var pageSize = 20;
var rootAccountId = 1;
//async action
var pollAsyncJobResult = function(args) {
$.ajax({

22
ui/scripts/system.js
View File

@ -775,7 +775,9 @@
},
preAction: function(args) {
var zone = $('.detail-view:last').data('view-args').context.zones[0];
//var zone = $('.detail-view:last').data('view-args').context.zones[0]; //this line causes a bug when going back and forth between listView and detailView: "$(".detail-view:last").data("view-args").context.zones is undefined"
var zone = selectedZoneObj;
var networksPresent = false;
// Only 1 guest network is allowed per basic zone,
@ -970,7 +972,7 @@
},
},
vlan: { label: 'VLAN ID' },
scope: { label: 'Scope' },
networkofferingdisplaytext: { label: 'Network offering' },
networkofferingid: {
label: 'Network offering',
@ -1024,11 +1026,21 @@
dataProvider: function(args) {
selectedGuestNetworkObj = args.context.networks[0];
selectedGuestNetworkObj["networkdomaintext"] = selectedGuestNetworkObj.networkdomain;
selectedGuestNetworkObj["networkofferingidText"] = selectedGuestNetworkObj.networkofferingid;
selectedGuestNetworkObj.networkdomaintext = selectedGuestNetworkObj.networkdomain;
selectedGuestNetworkObj.networkofferingidText = selectedGuestNetworkObj.networkofferingid;
if(selectedGuestNetworkObj.acltype == "Domain") {
if(selectedGuestNetworkObj.domainid == rootAccountId)
selectedGuestNetworkObj.scope = "All";
else
selectedGuestNetworkObj.scope = "Domain (" + selectedGuestNetworkObj.domain + ")";
}
else if (selectedGuestNetworkObj.acltype == "Account"){
selectedGuestNetworkObj.scope = "Account (" + selectedGuestNetworkObj.domain + ", " + selectedGuestNetworkObj.account + ")";
}
if(selectedGuestNetworkObj.vlan == null && selectedGuestNetworkObj.broadcasturi != null)
selectedGuestNetworkObj["vlan"] = selectedGuestNetworkObj.broadcasturi.replace("vlan://", "");
selectedGuestNetworkObj.vlan = selectedGuestNetworkObj.broadcasturi.replace("vlan://", "");
args.response.success({data: selectedGuestNetworkObj});
}