You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by sa...@apache.org on 2014/11/24 09:12:13 UTC
git commit: updated refs/heads/master to d475b62
Repository: cloudstack
Updated Branches:
refs/heads/master c615aafd7 -> d475b6283
CLOUDSTACK-7964: listAccounts API is not listing correct value of resource limits.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d475b628
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d475b628
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d475b628
Branch: refs/heads/master
Commit: d475b62838878677531d6daab667757baf63604e
Parents: c615aaf
Author: Sanjay Tripathi <sa...@citrix.com>
Authored: Mon Nov 24 13:37:18 2014 +0530
Committer: Sanjay Tripathi <sa...@citrix.com>
Committed: Mon Nov 24 13:44:42 2014 +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/d475b628/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 100644
--- 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