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

cloudstack 3.0 UI - physical network page - guest traffic type - networks tab (guest networks) - implement Refresh button.

This commit is contained in:
Jessica Wang 2012-04-09 16:16:02 -07:00
parent a046e71f37
commit 9bfea6a2ee
1 changed files with 39 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
ui/scripts/system.js
View File

@ -791,7 +791,7 @@
}
},
'guest': {
'guest': { //physical network + Guest traffic type
detailView: {
actions: {
edit: {
@ -1438,25 +1438,8 @@
}
});
$(items).each(function(){
this.networkdomaintext = this.networkdomain;
this.networkofferingidText = this.networkofferingid;
if(this.acltype == "Domain") {
if(this.domainid == rootAccountId)
this.scope = "All";
else
this.scope = "Domain (" + this.domain + ")";
}
else if (this.acltype == "Account"){
if(this.project != null)
this.scope = "Account (" + this.domain + ", " + this.project + ")";
else
this.scope = "Account (" + this.domain + ", " + this.account + ")";
}
if(this.vlan == null && this.broadcasturi != null)
this.vlan = this.broadcasturi.replace("vlan://", "");
$(items).each(function(){
addExtraPropertiesToGuestNetworkObject(this);
});
args.response.success({data: items});
@ -1766,12 +1749,20 @@
project: { label: 'label.project' }
}
],
dataProvider: function(args) {
selectedGuestNetworkObj = args.context.networks[0];
args.response.success({
actionFilter: cloudStack.actionFilter.guestNetwork,
data: selectedGuestNetworkObj
});
dataProvider: function(args) {
$.ajax({
url: createURL("listNetworks&id=" + args.context.networks[0].id),
dataType: "json",
async: false,
success: function(json) {
selectedGuestNetworkObj = json.listnetworksresponse.network[0];
addExtraPropertiesToGuestNetworkObject(selectedGuestNetworkObj);
args.response.success({
actionFilter: cloudStack.actionFilter.guestNetwork,
data: selectedGuestNetworkObj
});
}
});
}
}
}
@ -7769,5 +7760,27 @@
jsonObj.state = jsonObj.managedstate; //jsonObj.state == Unmanaged, PrepareUnmanaged, PrepareUnmanagedError
}
}
var addExtraPropertiesToGuestNetworkObject = function(jsonObj) {
jsonObj.networkdomaintext = jsonObj.networkdomain;
jsonObj.networkofferingidText = jsonObj.networkofferingid;
if(jsonObj.acltype == "Domain") {
if(jsonObj.domainid == rootAccountId)
jsonObj.scope = "All";
else
jsonObj.scope = "Domain (" + jsonObj.domain + ")";
}
else if (jsonObj.acltype == "Account"){
if(jsonObj.project != null)
jsonObj.scope = "Account (" + jsonObj.domain + ", " + jsonObj.project + ")";
else
jsonObj.scope = "Account (" + jsonObj.domain + ", " + jsonObj.account + ")";
}
if(jsonObj.vlan == null && jsonObj.broadcasturi != null) {
jsonObj.vlan = jsonObj.broadcasturi.replace("vlan://", "");
}
}
})($, cloudStack);