Repository: cloudstack Updated Branches: refs/heads/4.4-forward 3852afa71 -> 412793f9b
CLOUDSTACK-6513: remove commented code. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/412793f9 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/412793f9 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/412793f9 Branch: refs/heads/4.4-forward Commit: 412793f9b41bb03eda2b8474f9f22a12b5097327 Parents: 3852afa Author: Min Chen <[email protected]> Authored: Wed Apr 30 10:03:06 2014 -0700 Committer: Min Chen <[email protected]> Committed: Wed Apr 30 10:03:06 2014 -0700 ---------------------------------------------------------------------- server/src/com/cloud/api/query/QueryManagerImpl.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/412793f9/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 8047ea6..8e020fc 100644 --- a/server/src/com/cloud/api/query/QueryManagerImpl.java +++ b/server/src/com/cloud/api/query/QueryManagerImpl.java @@ -3346,11 +3346,8 @@ public class QueryManagerImpl extends ManagerBase implements QueryService { sc.addAnd("accountId", SearchCriteria.Op.IN, permittedAccountIds.toArray()); } } else if (templateFilter == TemplateFilter.sharedexecutable || templateFilter == TemplateFilter.shared) { + // only show templates shared by others 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);
