Updated Branches:
  refs/heads/rbac 11fe1f527 -> 9cd1a9532

Fix search criteria to support searching both specific entityType and *.

Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9cd1a953
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9cd1a953
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9cd1a953

Branch: refs/heads/rbac
Commit: 9cd1a95327de6e39c231ffd7884103eb07a6a2b0
Parents: 11fe1f5
Author: Min Chen <[email protected]>
Authored: Tue Oct 8 14:50:46 2013 -0700
Committer: Min Chen <[email protected]>
Committed: Tue Oct 8 14:50:46 2013 -0700

----------------------------------------------------------------------
 .../org/apache/cloudstack/acl/dao/AclRolePermissionDao.java | 4 ++--
 .../apache/cloudstack/acl/dao/AclRolePermissionDaoImpl.java | 9 ++++++---
 2 files changed, 8 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9cd1a953/engine/schema/src/org/apache/cloudstack/acl/dao/AclRolePermissionDao.java
----------------------------------------------------------------------
diff --git 
a/engine/schema/src/org/apache/cloudstack/acl/dao/AclRolePermissionDao.java 
b/engine/schema/src/org/apache/cloudstack/acl/dao/AclRolePermissionDao.java
index ae61262..b877e87 100644
--- a/engine/schema/src/org/apache/cloudstack/acl/dao/AclRolePermissionDao.java
+++ b/engine/schema/src/org/apache/cloudstack/acl/dao/AclRolePermissionDao.java
@@ -25,8 +25,8 @@ import com.cloud.utils.db.GenericDao;
 
 public interface AclRolePermissionDao extends GenericDao<AclRolePermissionVO, 
Long> {
 
-    List<AclRolePermissionVO> findByRoleAndEntity(long roleId, String 
entityType, AccessType accessType);
+    List<AclRolePermissionVO> listByRoleAndEntity(long roleId, String 
entityType, AccessType accessType);
 
-    List<AclRolePermissionVO> findByRole(long roleId);
+    List<AclRolePermissionVO> listByRole(long roleId);
 
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9cd1a953/engine/schema/src/org/apache/cloudstack/acl/dao/AclRolePermissionDaoImpl.java
----------------------------------------------------------------------
diff --git 
a/engine/schema/src/org/apache/cloudstack/acl/dao/AclRolePermissionDaoImpl.java 
b/engine/schema/src/org/apache/cloudstack/acl/dao/AclRolePermissionDaoImpl.java
index 57b0d33..ee34470 100644
--- 
a/engine/schema/src/org/apache/cloudstack/acl/dao/AclRolePermissionDaoImpl.java
+++ 
b/engine/schema/src/org/apache/cloudstack/acl/dao/AclRolePermissionDaoImpl.java
@@ -45,7 +45,9 @@ public class AclRolePermissionDaoImpl extends 
GenericDaoBase<AclRolePermissionVO
 
         findByRoleEntity = createSearchBuilder();
         findByRoleEntity.and("roleId", 
findByRoleEntity.entity().getAclRoleId(), SearchCriteria.Op.EQ);
-        findByRoleEntity.and("entityType", 
findByRoleEntity.entity().getEntityType(), SearchCriteria.Op.EQ);
+        findByRoleEntity.and().op("entityType", 
findByRoleEntity.entity().getEntityType(), SearchCriteria.Op.EQ);
+        findByRoleEntity.or("entityTypeStar", 
findByRoleEntity.entity().getEntityType(), SearchCriteria.Op.EQ);
+        findByRoleEntity.cp();
         findByRoleEntity.and("accessType", 
findByRoleEntity.entity().getAccessType(), SearchCriteria.Op.EQ);
         findByRoleEntity.done();
 
@@ -53,16 +55,17 @@ public class AclRolePermissionDaoImpl extends 
GenericDaoBase<AclRolePermissionVO
     }
 
     @Override
-    public List<AclRolePermissionVO> findByRoleAndEntity(long roleId, String 
entityType, AccessType accessType) {
+    public List<AclRolePermissionVO> listByRoleAndEntity(long roleId, String 
entityType, AccessType accessType) {
         SearchCriteria<AclRolePermissionVO> sc = findByRoleEntity.create();
         sc.setParameters("roleId", roleId);
         sc.setParameters("entityType", entityType);
         sc.setParameters("accessType", accessType);
+        sc.setParameters("entityTypeStar", "*");
         return listBy(sc);
     }
 
     @Override
-    public List<AclRolePermissionVO> findByRole(long roleId) {
+    public List<AclRolePermissionVO> listByRole(long roleId) {
         SearchCriteria<AclRolePermissionVO> sc = findByRoleEntity.create();
         sc.setParameters("roleId", roleId);
         return listBy(sc);

Reply via email to