inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/origin/feature/RM-2004_ExemptionCapabilityFixTests' into feature/RM_2053_ClassificationCapability_fixTests

Browse Source
This commit is contained in:
cagache
2018-03-30 14:18:26 +03:00
parent 1054fcef62 18cf69b56e
commit aa6d0b3ceb
3 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/user/UserRoles.java
View File

@@ -35,7 +35,7 @@ package org.alfresco.rest.rm.community.model.user;
*/ */
public enum UserRoles public enum UserRoles
{ {
IN_PLACE_WRITERS("ExtendedWriters","In-Place Writers"),
ROLE_RM_ADMIN("Administrator","Records Management Administrator"), ROLE_RM_ADMIN("Administrator","Records Management Administrator"),
ROLE_RM_MANAGER ("RecordsManager","Records Management Manager"), ROLE_RM_MANAGER ("RecordsManager","Records Management Manager"),
ROLE_RM_POWER_USER ("PowerUser","Records Management Power User"), ROLE_RM_POWER_USER ("PowerUser","Records Management Power User"),

2
rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/v0/RMRolesAndActionsAPI.java
View File

@@ -117,7 +117,7 @@ public class RMRolesAndActionsAPI extends BaseAPI
*/ */
public Set<String> getCapabilitiesForRole(String adminUser, String adminPassword, String role) public Set<String> getCapabilitiesForRole(String adminUser, String adminPassword, String role)
{ {
JSONObject jsonObject = doGetRequest(adminUser, adminPassword, RM_ROLES).getJSONObject("data"); JSONObject jsonObject = doGetRequest(adminUser, adminPassword, RM_ROLES + "?is=true").getJSONObject("data");
assertTrue("Could not find role '" + role + "' in " + jsonObject.keySet(), jsonObject.has(role)); assertTrue("Could not find role '" + role + "' in " + jsonObject.keySet(), jsonObject.has(role));
return jsonObject.getJSONObject(role).getJSONObject("capabilities").keySet(); return jsonObject.getJSONObject(role).getJSONObject("capabilities").keySet();
} }

4
rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/model/recordsPermissionModel.xml
View File

@@ -96,7 +96,6 @@
<includePermissionGroup type="rma:filePlanComponent" permissionGroup="DeleteHold"/> <includePermissionGroup type="rma:filePlanComponent" permissionGroup="DeleteHold"/>
<includePermissionGroup type="rma:filePlanComponent" permissionGroup="EditHold"/> <includePermissionGroup type="rma:filePlanComponent" permissionGroup="EditHold"/>
<includePermissionGroup type="rma:filePlanComponent" permissionGroup="EndRetention"/> <includePermissionGroup type="rma:filePlanComponent" permissionGroup="EndRetention"/>
</permissionGroup> </permissionGroup>
<permissionGroup name="Filing" allowFullControl="false" expose="true"> <permissionGroup name="Filing" allowFullControl="false" expose="true">
@@ -187,11 +186,8 @@
<permissionGroup name="EditHold" expose="false" allowFullControl="false"/> <permissionGroup name="EditHold" expose="false" allowFullControl="false"/>
<permissionGroup name="EndRetention" expose="false" allowFullControl="false"/> <permissionGroup name="EndRetention" expose="false" allowFullControl="false"/>
<!-- End --> <!-- End -->
<permission name="_ReadRecords" expose="false"> <permission name="_ReadRecords" expose="false">
<grantedToGroup permissionGroup="ReadRecords"/> <grantedToGroup permissionGroup="ReadRecords"/>
</permission> </permission>