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

Merged HEAD to BRANCHES/V2.1.0.x:

Browse Source 
75102: RM Performance testing



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.1.0.x@76598 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Roy Wetherall
2014-07-16 02:10:46 +00:00
parent ca26cf5715
commit dccb5e513d
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/role/FilePlanRoleServiceImpl.java
View File

@@ -663,7 +663,7 @@ public class FilePlanRoleServiceImpl implements FilePlanRoleService,
{ {
String capabilityName = permission.getPermission(); String capabilityName = permission.getPermission();
Capability capability = capabilityService.getCapability(capabilityName); Capability capability = capabilityService.getCapability(capabilityName);
if (capability != null) if (capability != null && !capability.isPrivate())
{ {
capabilities.add(capability); capabilities.add(capability);
} }
@@ -860,7 +860,7 @@ public class FilePlanRoleServiceImpl implements FilePlanRoleService,
{ {
throw new AlfrescoRuntimeException("Can not get authorities for role " + roleName + ", because it does not exist. (filePlan=" + filePlan.toString() + ")"); throw new AlfrescoRuntimeException("Can not get authorities for role " + roleName + ", because it does not exist. (filePlan=" + filePlan.toString() + ")");
} }
return authorityService.getContainedAuthorities(authorityType, role.getRoleGroupName(), false); return authorityService.getContainedAuthorities(authorityType, role.getRoleGroupName(), true);
} }
}, AuthenticationUtil.getSystemUserName()); }, AuthenticationUtil.getSystemUserName());

7
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RoleDeclarativeWebScript.java
View File

@@ -29,6 +29,7 @@ import org.alfresco.module.org_alfresco_module_rm.role.Role;
import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.StoreRef; import org.alfresco.service.cmr.repository.StoreRef;
import org.alfresco.service.cmr.security.AuthorityService; import org.alfresco.service.cmr.security.AuthorityService;
import org.alfresco.service.cmr.security.AuthorityType;
import org.apache.cxf.common.util.StringUtils; import org.apache.cxf.common.util.StringUtils;
import org.springframework.extensions.webscripts.DeclarativeWebScript; import org.springframework.extensions.webscripts.DeclarativeWebScript;
import org.springframework.extensions.webscripts.WebScriptRequest; import org.springframework.extensions.webscripts.WebScriptRequest;
@@ -172,7 +173,11 @@ public class RoleDeclarativeWebScript extends DeclarativeWebScript
for (String authority : authorities) for (String authority : authorities)
{ {
String displayLabel = authorityService.getAuthorityDisplayName(authority); String displayLabel = authority;
if (!AuthorityType.getAuthorityType(authority).equals(AuthorityType.USER))
{
displayLabel = authorityService.getAuthorityDisplayName(authority);
}
result.add(new AuthorityItem(authority, displayLabel)); result.add(new AuthorityItem(authority, displayLabel));
} }