From 554cab8ea13614f3cbe5349b161672fb8da2c416 Mon Sep 17 00:00:00 2001 From: Min Chen Date: Tue, 29 Apr 2014 19:02:57 -0700 Subject: [PATCH] CLOUDSTACK-6513: templateFilter=shared should not show self-owned template. --- server/src/com/cloud/api/query/QueryManagerImpl.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/server/src/com/cloud/api/query/QueryManagerImpl.java b/server/src/com/cloud/api/query/QueryManagerImpl.java index 9c31f4762a1..8047ea6db5e 100644 --- a/server/src/com/cloud/api/query/QueryManagerImpl.java +++ b/server/src/com/cloud/api/query/QueryManagerImpl.java @@ -3346,10 +3346,11 @@ public class QueryManagerImpl extends ManagerBase implements QueryService { sc.addAnd("accountId", SearchCriteria.Op.IN, permittedAccountIds.toArray()); } } else if (templateFilter == TemplateFilter.sharedexecutable || templateFilter == TemplateFilter.shared) { - SearchCriteria scc = _templateJoinDao.createSearchCriteria(); - scc.addOr("accountId", SearchCriteria.Op.IN, permittedAccountIds.toArray()); - scc.addOr("sharedAccountId", SearchCriteria.Op.IN, permittedAccountIds.toArray()); - sc.addAnd("accountId", SearchCriteria.Op.SC, scc); + sc.addAnd("sharedAccountId", SearchCriteria.Op.IN, permittedAccountIds.toArray()); +// SearchCriteria scc = _templateJoinDao.createSearchCriteria(); +// scc.addOr("accountId", SearchCriteria.Op.IN, permittedAccountIds.toArray()); +// scc.addOr("sharedAccountId", SearchCriteria.Op.IN, permittedAccountIds.toArray()); +// sc.addAnd("accountId", SearchCriteria.Op.SC, scc); } else if (templateFilter == TemplateFilter.executable) { SearchCriteria scc = _templateJoinDao.createSearchCriteria(); scc.addOr("publicTemplate", SearchCriteria.Op.EQ, true);