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

CLOUDSTACK-1941:Cannot delete users in the default admin account within the UI

This commit is contained in:
Pranav Saxena 2013-04-22 14:19:38 +05:30
parent 987941a5b0
commit e309a91a9b
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ui/scripts/accounts.js
View File

@ -1372,6 +1372,9 @@
if (jsonObj.state == 'Destroyed') return [];
if( isAdmin() && jsonObj.isdefault == false)
allowedActions.push("remove");
if(isAdmin()) {
allowedActions.push("edit"); //updating networkdomain is allowed on any account, including system-generated default admin account
if(!(jsonObj.domain == "ROOT" && jsonObj.name == "admin" && jsonObj.accounttype == 1)) { //if not system-generated default admin account
@ -1393,6 +1396,10 @@
var userActionfilter = function(args) {
var jsonObj = args.context.item;
var allowedActions = [];
if( isAdmin() && jsonObj.isdefault == false)
allowedActions.push("remove");
if(isAdmin()) {
allowedActions.push("edit");
allowedActions.push("changePassword");