diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/security/rm-policy-context.xml b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/security/rm-policy-context.xml index df078ff509..5c7f4551ed 100644 --- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/security/rm-policy-context.xml +++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/security/rm-policy-context.xml @@ -38,7 +38,6 @@ - diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/WriteContentPolicy.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/WriteContentPolicy.java index e604675f9f..bdd15f5e63 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/WriteContentPolicy.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/WriteContentPolicy.java @@ -27,46 +27,19 @@ package org.alfresco.module.org_alfresco_module_rm.capability.policy; -import java.util.Set; - -import org.alfresco.module.org_alfresco_module_rm.record.RecordServiceImpl; -import org.alfresco.module.org_alfresco_module_rm.util.TransactionalResourceHelper; import org.alfresco.service.cmr.repository.NodeRef; import org.aopalliance.intercept.MethodInvocation; -import net.sf.acegisecurity.vote.AccessDecisionVoter; - public class WriteContentPolicy extends AbstractBasePolicy { - protected TransactionalResourceHelper transactionalResourceHelper; - - public void setTransactionalResourceHelper(TransactionalResourceHelper transactionalResourceHelper) - { - this.transactionalResourceHelper = transactionalResourceHelper; - } - @SuppressWarnings("rawtypes") public int evaluate( MethodInvocation invocation, Class[] params, ConfigAttributeDefinition cad) { - try{ - NodeRef updatee = getTestNode(invocation, params, cad.getParameters().get(0), cad.isParent()); - Set newRecords = transactionalResourceHelper.getSet(RecordServiceImpl.KEY_NEW_RECORDS); - if(newRecords.contains(updatee)) - { - return AccessDecisionVoter.ACCESS_GRANTED; - } - else - { - return getCapabilityService().getCapability("WriteContent").evaluate(updatee); - } - } - catch(Exception ex) - { - throw ex; - } + NodeRef updatee = getTestNode(invocation, params, cad.getParameters().get(0), cad.isParent()); + return getCapabilityService().getCapability("WriteContent").evaluate(updatee); } } diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/record/RecordServiceImpl.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/record/RecordServiceImpl.java index f1a1991fc3..7add39936d 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/record/RecordServiceImpl.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/record/RecordServiceImpl.java @@ -485,6 +485,7 @@ public class RecordServiceImpl extends BaseBehaviourBean validateLinkConditions(nodeRef, parentNodeRef); } } + nodeService.addAspect(nodeRef, RecordsManagementModel.ASPECT_RECORD, null); } } catch (RecordLinkRuntimeException e)