Updated Branches:
  refs/heads/rbac 88e12c9b8 -> 11fe1f527

Add role permission for normal user role.

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

Branch: refs/heads/rbac
Commit: 11fe1f527aa6a7d52a73ca6708b89325083ba1a7
Parents: 88e12c9
Author: Min Chen <[email protected]>
Authored: Tue Oct 8 11:08:54 2013 -0700
Committer: Min Chen <[email protected]>
Committed: Tue Oct 8 11:08:54 2013 -0700

----------------------------------------------------------------------
 .../src/org/apache/cloudstack/acl/dao/AclRolePermissionDao.java | 2 +-
 .../org/apache/cloudstack/acl/dao/AclRolePermissionDaoImpl.java | 4 ++--
 setup/db/db/schema-420to430.sql                                 | 5 +++++
 3 files changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/11fe1f52/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 64da36c..ae61262 100644
--- a/engine/schema/src/org/apache/cloudstack/acl/dao/AclRolePermissionDao.java
+++ b/engine/schema/src/org/apache/cloudstack/acl/dao/AclRolePermissionDao.java
@@ -25,7 +25,7 @@ import com.cloud.utils.db.GenericDao;
 
 public interface AclRolePermissionDao extends GenericDao<AclRolePermissionVO, 
Long> {
 
-    AclRolePermissionVO findByRoleAndEntity(long roleId, String entityType, 
AccessType accessType);
+    List<AclRolePermissionVO> findByRoleAndEntity(long roleId, String 
entityType, AccessType accessType);
 
     List<AclRolePermissionVO> findByRole(long roleId);
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/11fe1f52/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 73a0aac..57b0d33 100644
--- 
a/engine/schema/src/org/apache/cloudstack/acl/dao/AclRolePermissionDaoImpl.java
+++ 
b/engine/schema/src/org/apache/cloudstack/acl/dao/AclRolePermissionDaoImpl.java
@@ -53,12 +53,12 @@ public class AclRolePermissionDaoImpl extends 
GenericDaoBase<AclRolePermissionVO
     }
 
     @Override
-    public AclRolePermissionVO findByRoleAndEntity(long roleId, String 
entityType, AccessType accessType) {
+    public List<AclRolePermissionVO> findByRoleAndEntity(long roleId, String 
entityType, AccessType accessType) {
         SearchCriteria<AclRolePermissionVO> sc = findByRoleEntity.create();
         sc.setParameters("roleId", roleId);
         sc.setParameters("entityType", entityType);
         sc.setParameters("accessType", accessType);
-        return findOneBy(sc);
+        return listBy(sc);
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/11fe1f52/setup/db/db/schema-420to430.sql
----------------------------------------------------------------------
diff --git a/setup/db/db/schema-420to430.sql b/setup/db/db/schema-420to430.sql
index 8b91f84..259c936 100644
--- a/setup/db/db/schema-420to430.sql
+++ b/setup/db/db/schema-420to430.sql
@@ -396,6 +396,11 @@ INSERT IGNORE INTO `cloud`.`acl_role_permission` (role_id, 
entity_type, access_t
 INSERT IGNORE INTO `cloud`.`acl_role_permission` (role_id, entity_type, 
access_type, scope, permission) VALUES (2, '*', 'ModifyEntry', 'REGION', 1);
 INSERT IGNORE INTO `cloud`.`acl_role_permission` (role_id, entity_type, 
access_type, scope, permission) VALUES (2, '*', 'DeleteEntry', 'REGION', 1);
 INSERT IGNORE INTO `cloud`.`acl_role_permission` (role_id, entity_type, 
access_type, scope, permission) VALUES (2, '*', 'OperateEntry', 'REGION', 1);
+INSERT IGNORE INTO `cloud`.`acl_role_permission` (role_id, entity_type, 
access_type, scope, permission) VALUES (1, '*', 'CreateEntry', 'ACCOUNT', 1);
+INSERT IGNORE INTO `cloud`.`acl_role_permission` (role_id, entity_type, 
access_type, scope, permission) VALUES (1, '*', 'ListEntry', 'ACCOUNT', 1);
+INSERT IGNORE INTO `cloud`.`acl_role_permission` (role_id, entity_type, 
access_type, scope, permission) VALUES (1, '*', 'ModifyEntry', 'ACCOUNT', 1);
+INSERT IGNORE INTO `cloud`.`acl_role_permission` (role_id, entity_type, 
access_type, scope, permission) VALUES (1, '*', 'DeleteEntry', 'ACCOUNT', 1);
+INSERT IGNORE INTO `cloud`.`acl_role_permission` (role_id, entity_type, 
access_type, scope, permission) VALUES (1, '*', 'OperateEntry', 'ACCOUNT', 1);
 
 DROP VIEW IF EXISTS `cloud`.`acl_role_view`;
 CREATE VIEW `cloud`.`acl_role_view` AS

Reply via email to