You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by mc...@apache.org on 2014/12/18 19:56:26 UTC
git commit: updated refs/heads/4.5 to 3506789
Repository: cloudstack
Updated Branches:
refs/heads/4.5 67a7f74be -> 3506789b0
CLOUDSTACK-8093:Not able to list shared templates by passing id.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3506789b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3506789b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3506789b
Branch: refs/heads/4.5
Commit: 3506789b0b4d0da55f9713f19c1e0f41c16830ee
Parents: 67a7f74
Author: Min Chen <mi...@citrix.com>
Authored: Wed Dec 17 22:33:24 2014 -0800
Committer: Min Chen <mi...@citrix.com>
Committed: Thu Dec 18 10:27:20 2014 -0800
----------------------------------------------------------------------
server/src/com/cloud/api/query/QueryManagerImpl.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3506789b/server/src/com/cloud/api/query/QueryManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/query/QueryManagerImpl.java b/server/src/com/cloud/api/query/QueryManagerImpl.java
index 31273ec..a5e7d5c 100644
--- a/server/src/com/cloud/api/query/QueryManagerImpl.java
+++ b/server/src/com/cloud/api/query/QueryManagerImpl.java
@@ -3015,8 +3015,7 @@ public class QueryManagerImpl extends ManagerBase implements QueryService {
// if template is not public, perform permission check here
if (!template.isPublicTemplate() && caller.getType() != Account.ACCOUNT_TYPE_ADMIN) {
- Account owner = _accountMgr.getAccount(template.getAccountId());
- _accountMgr.checkAccess(caller, null, true, owner);
+ _accountMgr.checkAccess(caller, null, false, template);
}
// if templateId is specified, then we will just use the id to