You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2014/05/02 18:47:36 UTC
[2/3] git commit: updated refs/heads/4.4 to 5132264
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/a3a0f13b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a3a0f13b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a3a0f13b
Branch: refs/heads/4.4
Commit: a3a0f13bb8f5a16c1660b26e3154a97e8a743c06
Parents: 554cab8
Author: Min Chen <mi...@citrix.com>
Authored: Wed Apr 30 10:03:06 2014 -0700
Committer: Daan Hoogland <da...@onecht.net>
Committed: Thu May 1 10:38:05 2014 +0200
----------------------------------------------------------------------
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/a3a0f13b/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);