You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by mc...@apache.org on 2014/05/02 01:04:34 UTC
[06/10] git commit: updated refs/heads/master to 134a799
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/2521fd48
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2521fd48
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2521fd48
Branch: refs/heads/master
Commit: 2521fd482b74f8050c574a95bd3afa389e7650de
Parents: db9aee4
Author: Min Chen <mi...@citrix.com>
Authored: Wed Apr 30 10:03:06 2014 -0700
Committer: Min Chen <mi...@citrix.com>
Committed: Thu May 1 15:57:28 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/2521fd48/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);