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

RM: Build fixes

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@49308 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Roy Wetherall
2013-04-17 05:30:26 +00:00
parent c2d977d9db
commit 0028c25681
5 changed files with 80 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMSecurityCommon.java
View File

@@ -190,8 +190,7 @@ public class RMSecurityCommon
{
if (logger.isDebugEnabled())
{
logger.debug("\t\tAdmin access");
Thread.dumpStack();
logger.debug("\t\tAdmin user, access granted. (nodeRef=" + nodeRef.toString() + ", user=" + AuthenticationUtil.getRunAsUser() + ")");
}
return setTransactionCache("checkRmRead", nodeRef, AccessDecisionVoter.ACCESS_GRANTED);
}
@@ -200,8 +199,7 @@ public class RMSecurityCommon
{
if (logger.isDebugEnabled())
{
logger.debug("\t\tPermission is denied");
Thread.dumpStack();
logger.debug("\t\tUser does not have read record permission on node, access denied. (nodeRef=" + nodeRef.toString() + ", user=" + AuthenticationUtil.getRunAsUser() + ")");
}
return setTransactionCache("checkRmRead", nodeRef, AccessDecisionVoter.ACCESS_DENIED);
}
@@ -210,8 +208,7 @@ public class RMSecurityCommon
{
if (logger.isDebugEnabled())
{
logger.debug("\t\tPermission is denied");
Thread.dumpStack();
logger.debug("\t\tUser does not have view records capability permission on node, access denied. (filePlan=" + filePlan.toString() + ", user=" + AuthenticationUtil.getRunAsUser() + ")");
}
return setTransactionCache("checkRmRead", nodeRef, AccessDecisionVoter.ACCESS_DENIED);
}

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

@@ -761,8 +761,11 @@ public class FilePlanRoleServiceImpl implements FilePlanRoleService,
{
public Void doWork() throws Exception
{
String roleAuthority = authorityService.getName(AuthorityType.GROUP, getFullRoleName(role, filePlan));
authorityService.addAuthority(roleAuthority, authorityName);
if (getAllAssignedToRole(filePlan, role).contains(authorityName) == false)
{
String roleAuthority = authorityService.getName(AuthorityType.GROUP, getFullRoleName(role, filePlan));
authorityService.addAuthority(roleAuthority, authorityName);
}
return null;
}

49
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/vital/BroadcastVitalRecordDefinitionAction.java
View File

@@ -86,35 +86,38 @@ public class BroadcastVitalRecordDefinitionAction extends RMActionExecuterAbstra
{
NodeRef nextChild = nextAssoc.getChildRef();
// If the child is a record, then the VitalRecord aspect needs to be applied or updated
if (recordService.isRecord(nextChild))
if (recordsManagementService.isFilePlanComponent(nextChild) == true)
{
if (parentVri)
// If the child is a record, then the VitalRecord aspect needs to be applied or updated
if (recordService.isRecord(nextChild))
{
VitalRecordDefinition vrDefn = vitalRecordService.getVitalRecordDefinition(nextChild);
Map<QName, Serializable> aspectProps = new HashMap<QName, Serializable>();
aspectProps.put(PROP_REVIEW_AS_OF, vrDefn.getNextReviewDate());
nodeService.addAspect(nextChild, RecordsManagementModel.ASPECT_VITAL_RECORD, aspectProps);
if (parentVri)
{
VitalRecordDefinition vrDefn = vitalRecordService.getVitalRecordDefinition(nextChild);
Map<QName, Serializable> aspectProps = new HashMap<QName, Serializable>();
aspectProps.put(PROP_REVIEW_AS_OF, vrDefn.getNextReviewDate());
nodeService.addAspect(nextChild, RecordsManagementModel.ASPECT_VITAL_RECORD, aspectProps);
}
else
{
nodeService.removeAspect(nextChild, RecordsManagementModel.ASPECT_VITAL_RECORD);
}
}
else
// copy the vitalRecordDefinition properties from the parent to the child
{
nodeService.removeAspect(nextChild, RecordsManagementModel.ASPECT_VITAL_RECORD);
Map<QName, Serializable> childProps = nodeService.getProperties(nextChild);
childProps.put(PROP_REVIEW_PERIOD, parentReviewPeriod);
childProps.put(PROP_VITAL_RECORD_INDICATOR, parentVri);
nodeService.setProperties(nextChild, childProps);
}
// Recurse down the containment hierarchy to all containers
if (recordService.isRecord(nextChild) == false)
{
this.propagateChangeToChildrenOf(nextChild);
}
}
else
// copy the vitalRecordDefinition properties from the parent to the child
{
Map<QName, Serializable> childProps = nodeService.getProperties(nextChild);
childProps.put(PROP_REVIEW_PERIOD, parentReviewPeriod);
childProps.put(PROP_VITAL_RECORD_INDICATOR, parentVri);
nodeService.setProperties(nextChild, childProps);
}
// Recurse down the containment hierarchy to all containers
if (recordService.isRecord(nextChild) == false)
{
this.propagateChangeToChildrenOf(nextChild);
}
}
}