Repository: cloudstack Updated Branches: refs/heads/4.4 62b210b58 -> 513226430
CLOUDSTACK-6513: templateFilter=shared should not show self-owned template. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/554cab8e Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/554cab8e Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/554cab8e Branch: refs/heads/4.4 Commit: 554cab8ea13614f3cbe5349b161672fb8da2c416 Parents: 62b210b Author: Min Chen <[email protected]> Authored: Tue Apr 29 19:02:57 2014 -0700 Committer: Daan Hoogland <[email protected]> Committed: Thu May 1 10:37:46 2014 +0200 ---------------------------------------------------------------------- server/src/com/cloud/api/query/QueryManagerImpl.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/554cab8e/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 9c31f47..8047ea6 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<TemplateJoinVO> 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<TemplateJoinVO> 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<TemplateJoinVO> scc = _templateJoinDao.createSearchCriteria(); scc.addOr("publicTemplate", SearchCriteria.Op.EQ, true);
