From ebe787704bc726260759ab8789da3cff92c7e6ed Mon Sep 17 00:00:00 2001
From: bfederle <bfederle@gmail.com>
Date: Wed, 21 Dec 2011 18:28:04 -0800
Subject: [PATCH] bug 12611

Fix action filter for projects user management

status 12611: resolved fixed
---
 ui/scripts/projects.js | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/ui/scripts/projects.js b/ui/scripts/projects.js
index a5b2bb21858..2df71a753b4 100644
--- a/ui/scripts/projects.js
+++ b/ui/scripts/projects.js
@@ -379,17 +379,12 @@
         }
       },
       actionPreFilter: function(args) {
-        if (!cloudStack.context.projects) { // This is for the new project wizard
+        if (!cloudStack.context.projects &&
+            args.context.multiRule[0].role != 'Admin') { // This is for the new project wizard
           return ['destroy'];
         }
 
-        var project = cloudStack.context.projects[0];
-        var projectOwner = project.account;
-        var rowAccount = args.context.multiRule[0].account;
-        var userAccount = cloudStack.context.users[0].account;
-        var isEditableRow = rowAccount != projectOwner && userAccount == projectOwner;
-
-        if (isEditableRow) {
+        if (args.context.multiRule[0].role != 'Admin') {
           return args.context.actions;
         }