You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by al...@apache.org on 2013/10/29 18:44:54 UTC
git commit: updated refs/heads/4.2 to e5c0de6
Updated Branches:
refs/heads/4.2 375a59d2f -> e5c0de6a2
CLOUDSTACK-4988: when listTemplates call is executed by regular user, but templateFilter=community is passed in, return public templates of subdomains
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e5c0de6a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e5c0de6a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e5c0de6a
Branch: refs/heads/4.2
Commit: e5c0de6a2dd1ebd827659ca4b0d8834c20d5ab3a
Parents: 375a59d
Author: Alena Prokharchyk <al...@citrix.com>
Authored: Tue Oct 29 10:30:30 2013 -0700
Committer: Alena Prokharchyk <al...@citrix.com>
Committed: Tue Oct 29 10:30:30 2013 -0700
----------------------------------------------------------------------
server/src/com/cloud/api/query/QueryManagerImpl.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e5c0de6a/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 6003534..305c065 100644
--- a/server/src/com/cloud/api/query/QueryManagerImpl.java
+++ b/server/src/com/cloud/api/query/QueryManagerImpl.java
@@ -2827,7 +2827,8 @@ public class QueryManagerImpl extends ManagerBase implements QueryService {
}
// get all child domain ID's
- if (_accountMgr.isAdmin(account.getType())) {
+ if (_accountMgr.isAdmin(account.getType())
+ || (templateFilter == TemplateFilter.featured || templateFilter == TemplateFilter.community)) {
List<DomainVO> allChildDomains = _domainDao.findAllChildren(accountDomain.getPath(),
accountDomain.getId());
for (DomainVO childDomain : allChildDomains) {