cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bhais...@apache.org
Subject [02/12] git commit: updated refs/heads/4.5 to 4e01d61
Date Tue, 20 Jan 2015 06:20:26 GMT
CLOUDSTACK-7964: listAccounts API is not listing correct value of resource limits.

(cherry picked from commit d475b62838878677531d6daab667757baf63604e)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b77cbea0
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b77cbea0
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b77cbea0

Branch: refs/heads/4.5
Commit: b77cbea0f35b2bcdbbd41f742032207c4aefbf1b
Parents: bc4dca7
Author: Sanjay Tripathi <sanjay.tripathi@citrix.com>
Authored: Mon Nov 24 13:37:18 2014 +0530
Committer: Rohit Yadav <rohit.yadav@shapeblue.com>
Committed: Tue Jan 20 11:29:34 2015 +0530

----------------------------------------------------------------------
 server/src/com/cloud/api/query/dao/AccountJoinDaoImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b77cbea0/server/src/com/cloud/api/query/dao/AccountJoinDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/query/dao/AccountJoinDaoImpl.java b/server/src/com/cloud/api/query/dao/AccountJoinDaoImpl.java
index 31d5a2c..fadaed5 100755
--- a/server/src/com/cloud/api/query/dao/AccountJoinDaoImpl.java
+++ b/server/src/com/cloud/api/query/dao/AccountJoinDaoImpl.java
@@ -75,7 +75,7 @@ public class AccountJoinDaoImpl extends GenericDaoBase<AccountJoinVO,
Long> impl
         accountResponse.setBytesReceived(account.getBytesReceived());
         accountResponse.setBytesSent(account.getBytesSent());
 
-        boolean fullView = (view == ResponseView.Full);
+        boolean fullView = (view == ResponseView.Full && _acctMgr.isRootAdmin(account.getId()));
         setResourceLimits(account, fullView, accountResponse);
 
         //get resource limits for projects


Mime
View raw message