etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Optimize fix for CLOUDSTACK-5987.

This commit is contained in:
Min Chen 2014-02-07 16:08:12 -08:00
parent 63e42d3c47
commit 7bab0bc304
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/src/com/cloud/api/query/QueryManagerImpl.java
View File

@ -2871,6 +2871,7 @@ public class QueryManagerImpl extends ManagerBase implements QueryService {
sc.addAnd("featured", SearchCriteria.Op.EQ, false);
}
/* We don't need this any more to check domain id, based on CLOUDSTACK-5987
// for public templates, we should get all public templates from all domains in the system
// get all parent domain ID's all the way till root domain
List<Long> domainTree = new ArrayList<Long>();
@ -2887,6 +2888,7 @@ public class QueryManagerImpl extends ManagerBase implements QueryService {
scc.addOr("domainId", SearchCriteria.Op.IN, domainTree.toArray());
scc.addOr("domainId", SearchCriteria.Op.NULL);
sc.addAnd("domainId", SearchCriteria.Op.SC, scc);
*/
} else if (templateFilter == TemplateFilter.self || templateFilter == TemplateFilter.selfexecutable) {
if (permittedDomains.contains(caller.getDomainId())) {
// this caller acts like a domain admin