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 - account page - consolidate Public IP Limits to Edit action.

This commit is contained in:
Jessica Wang 2011-11-04 18:55:10 -07:00
parent 5d8b35009d
commit e249f6fc4c
1 changed files with 32 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
ui/scripts/accounts.js
View File

@ -189,7 +189,7 @@
actions: {
edit: {
label: 'Edit',
label: 'Edit ("-1" indicates no limit to the amount of resources create)',
action: function(args) {
var accountObj = args.context.accounts[0];
$.ajax({
@ -209,7 +209,17 @@
success: function(json) {
selectedAccountResourceLimits = json.updateresourcelimitresponse.resourcelimit;
}
});
});
$.ajax({
url: createURL("updateResourceLimit&resourceType=1&max=" + todb(args.data.ipLimits) + "&account=" + accountObj.name + "&domainid=" + accountObj.domainid),
dataType: "json",
async: false,
success: function(json) {
selectedAccountResourceLimits = json.updateresourcelimitresponse.resourcelimit;
}
});
}
}
},
@ -268,7 +278,24 @@
}
}
}
},
ipLimits: {
label: 'Public IP limits',
isEditable: true,
converter: function(args) {
if (selectedAccountResourceLimits != null) {
for (var i = 0; i < selectedAccountResourceLimits.length; i++) {
if(selectedAccountResourceLimits[i].resourcetype == "1") {
return selectedAccountResourceLimits[i].max;
break;
}
}
}
}
}
}
],
@ -474,9 +501,10 @@
if(isAdmin()) {
if(jsonObj.id != systemAccountId && jsonObj.id != adminAccountId) {
allowedActions.push("edit");
//allowedActions.push("edit");
if (jsonObj.accounttype == roleTypeUser || jsonObj.accounttype == roleTypeDomainAdmin) {
allowedActions.push("updateResourceLimits");
//allowedActions.push("updateResourceLimits");
allowedActions.push("edit");
}
if(jsonObj.state == "enabled") {
allowedActions.push("disable");