From 309be015cec77ba39a93cf5d83e6eeae97e99aec Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Mon, 24 Sep 2012 15:23:51 -0700 Subject: [PATCH] CLOUDSTACK-109: cloudstack UI - (1) account page: fix a bug that system-generated default admin account wrongly had enalbe/disable/lock/remove option. (2) user page - fix a bug that system-generated default admin account user wrongly had enable/disable/remove option. --- ui/scripts/accounts.js | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/ui/scripts/accounts.js b/ui/scripts/accounts.js index 34a9538d89e..03ec799c00f 100644 --- a/ui/scripts/accounts.js +++ b/ui/scripts/accounts.js @@ -19,12 +19,6 @@ var domainObjs; var rootDomainId; - var systemAccountId = 1; - var adminAccountId = 2; - - var systemUserId = 1; - var adminUserId = 2; - cloudStack.sections.accounts = { title: 'label.accounts', id: 'accounts', @@ -1097,7 +1091,7 @@ if (jsonObj.state == 'Destroyed') return []; if(isAdmin()) { - if(jsonObj.id != systemAccountId && jsonObj.id != adminAccountId) { + if(!(jsonObj.domain == "ROOT" && jsonObj.name == "admin" && jsonObj.accounttype == 1)) { //if not system-generated default admin account //allowedActions.push("edit"); if (jsonObj.accounttype == roleTypeUser || jsonObj.accounttype == roleTypeDomainAdmin) { //allowedActions.push("updateResourceLimits"); @@ -1127,7 +1121,7 @@ allowedActions.push("edit"); allowedActions.push("changePassword"); allowedActions.push("generateKeys"); - if(jsonObj.id != systemUserId && jsonObj.id != adminUserId) { + if(!(jsonObj.domain == "ROOT" && jsonObj.account == "admin" && jsonObj.accounttype == 1)) { //if not system-generated default admin account user if(jsonObj.state == "enabled") allowedActions.push("disable"); if(jsonObj.state == "disabled")