From 2521fd482b74f8050c574a95bd3afa389e7650de Mon Sep 17 00:00:00 2001 From: Min Chen Date: Wed, 30 Apr 2014 10:03:06 -0700 Subject: [PATCH] CLOUDSTACK-6513: remove commented code. --- server/src/com/cloud/api/query/QueryManagerImpl.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/server/src/com/cloud/api/query/QueryManagerImpl.java b/server/src/com/cloud/api/query/QueryManagerImpl.java index 8047ea6db5e..8e020fc56a0 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 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);