cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mc...@apache.org
Subject [04/10] git commit: updated refs/heads/master to 134a799
Date Thu, 01 May 2014 23:04:32 GMT
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/db9aee45
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/db9aee45
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/db9aee45

Branch: refs/heads/master
Commit: db9aee45170ac0b5d637e09ffbd7422a533aa380
Parents: a9072a6
Author: Min Chen <min.chen@citrix.com>
Authored: Tue Apr 29 19:02:57 2014 -0700
Committer: Min Chen <min.chen@citrix.com>
Committed: Thu May 1 15:57:28 2014 -0700

----------------------------------------------------------------------
 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/db9aee45/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);


Mime
View raw message