Author: dcrutchf
Date: 2010-03-25 10:37:52 -0700 (Thu, 25 Mar 2010)
New Revision: 14423
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14423
Modified:
trunk/installer/data/db-upgrade.xml
trunk/src/org/hyperic/hq/authz/shared/ResourceOperationsHelper.java
Log:
Corrected operation mappings for creating servers and services
Modified: trunk/installer/data/db-upgrade.xml
===================================================================
--- trunk/installer/data/db-upgrade.xml 2010-03-25 07:56:38 UTC (rev 14422)
+++ trunk/installer/data/db-upgrade.xml 2010-03-25 17:37:52 UTC (rev 14423)
@@ -10985,23 +10985,23 @@
INSERT INTO EAM_ROLE_OPERATION_MAP(ROLE_ID, OPERATION_ID)
SELECT m.role_id, 303 FROM EAM_ROLE r
INNER JOIN EAM_ROLE_OPERATION_MAP m on r.id = m.role_id
- WHERE m.operation_id = 304
+ WHERE m.operation_id = 308
AND (SELECT count(*) FROM EAM_ROLE_OPERATION_MAP rm
WHERE rm.role_id = r.id AND rm.operation_id = 303) = 0
</statement>
<statement desc="Adding delete server permission to any role that has create server permission...">
INSERT INTO EAM_ROLE_OPERATION_MAP(ROLE_ID, OPERATION_ID)
- SELECT m.role_id, 304 FROM EAM_ROLE r
+ SELECT m.role_id, 308 FROM EAM_ROLE r
INNER JOIN EAM_ROLE_OPERATION_MAP m on r.id = m.role_id
WHERE m.operation_id = 303
AND (SELECT count(*) FROM EAM_ROLE_OPERATION_MAP rm
- WHERE rm.role_id = r.id AND rm.operation_id = 304) = 0
+ WHERE rm.role_id = r.id AND rm.operation_id = 308) = 0
</statement>
<statement desc="Adding update server permission to any role that has create or delete server permission...">
INSERT INTO EAM_ROLE_OPERATION_MAP(ROLE_ID, OPERATION_ID)
SELECT distinct m.role_id, 307 FROM EAM_ROLE r
INNER JOIN EAM_ROLE_OPERATION_MAP m on r.id = m.role_id
- WHERE (m.operation_id = 304 or m.operation_id = 303)
+ WHERE (m.operation_id = 308 or m.operation_id = 303)
AND (SELECT count(*) FROM EAM_ROLE_OPERATION_MAP rm
WHERE rm.role_id = r.id AND rm.operation_id = 307) = 0
</statement>
@@ -11009,7 +11009,7 @@
INSERT INTO EAM_ROLE_OPERATION_MAP(ROLE_ID, OPERATION_ID)
SELECT distinct m.role_id, 311 FROM EAM_ROLE r
INNER JOIN EAM_ROLE_OPERATION_MAP m on r.id = m.role_id
- WHERE (m.operation_id = 304 or m.operation_id = 303 or m.operation_id = 307)
+ WHERE (m.operation_id = 308 or m.operation_id = 303 or m.operation_id = 307)
AND (SELECT count(*) FROM EAM_ROLE_OPERATION_MAP rm
WHERE rm.role_id = r.id AND rm.operation_id = 311) = 0
</statement>
Modified: trunk/src/org/hyperic/hq/authz/shared/ResourceOperationsHelper.java
===================================================================
--- trunk/src/org/hyperic/hq/authz/shared/ResourceOperationsHelper.java 2010-03-25 07:56:38 UTC (rev 14422)
+++ trunk/src/org/hyperic/hq/authz/shared/ResourceOperationsHelper.java 2010-03-25 17:37:52 UTC (rev 14423)
@@ -47,13 +47,15 @@
operationsList.add(AuthzConstants.platformOpRemovePlatform);
operationsList.add(AuthzConstants.platformOpManageAlerts);
operationsList.add(AuthzConstants.platformOpControlPlatform);
- operationsList.add(AuthzConstants.serverOpCreateServer);
+ // TODO Create server is add server. This needs to be cleaned up.
+ operationsList.add(AuthzConstants.platformOpAddServer);
operationsList.add(AuthzConstants.serverOpViewServer);
operationsList.add(AuthzConstants.serverOpModifyServer);
operationsList.add(AuthzConstants.serverOpRemoveServer);
operationsList.add(AuthzConstants.serverOpManageAlerts);
operationsList.add(AuthzConstants.serverOpControlServer);
- operationsList.add(AuthzConstants.serviceOpCreateService);
+ // TODO Create service is add service. This needs to be cleaned up.
+ operationsList.add(AuthzConstants.serverOpAddService);
operationsList.add(AuthzConstants.serviceOpViewService);
operationsList.add(AuthzConstants.serviceOpModifyService);
operationsList.add(AuthzConstants.serviceOpRemoveService);
|
