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

RM-1867 (Reject rule works incorrect if set up in File Plan)

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.3@96524 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Tuna Aksoy
2015-02-09 10:17:39 +00:00
parent 4a587ca4d1
commit 3e63485907
2 changed files with 13 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
rm-server/config/alfresco/module/org_alfresco_module_rm/rm-action-context.xml
View File

@@ -731,6 +731,7 @@
<bean id="reject" class="org.alfresco.module.org_alfresco_module_rm.action.impl.RejectAction" parent="rmAction"> <bean id="reject" class="org.alfresco.module.org_alfresco_module_rm.action.impl.RejectAction" parent="rmAction">
<property name="publicAction" value="true"/> <property name="publicAction" value="true"/>
<property name="auditedImmediately" value="true" />
</bean> </bean>
<!-- File To --> <!-- File To -->
@@ -844,9 +845,9 @@
<property name="publicAction" value="true"/> <property name="publicAction" value="true"/>
<property name="allowParameterSubstitutions" value="true"/> <property name="allowParameterSubstitutions" value="true"/>
</bean> </bean>
<!-- Unlink Record --> <!-- Unlink Record -->
<bean id="unlinkFrom_proxy" parent="rmProxyAction"> <bean id="unlinkFrom_proxy" parent="rmProxyAction">
<property name="target" ref="unlinkFrom"/> <property name="target" ref="unlinkFrom"/>
<property name="interceptorNames"> <property name="interceptorNames">

26
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/extractor/FilePlanNamePathDataExtractor.java
View File

@@ -77,25 +77,19 @@ public final class FilePlanNamePathDataExtractor extends AbstractDataExtractor
*/ */
public Serializable extractData(Serializable value) public Serializable extractData(Serializable value)
{ {
String extractedData = null;
NodeRef nodeRef = (NodeRef) value; NodeRef nodeRef = (NodeRef) value;
if (nodeService.hasAspect(nodeRef, RecordsManagementModel.ASPECT_FILE_PLAN_COMPONENT))
// Get path from the RM root
List<NodeRef> nodeRefPath = filePlanService.getNodeRefPath(nodeRef);
StringBuilder sb = new StringBuilder(128);
for (NodeRef pathNodeRef : nodeRefPath)
{ {
// Get path from the RM root String name = (String)nodeService.getProperty(pathNodeRef, ContentModel.PROP_NAME);
List<NodeRef> nodeRefPath = filePlanService.getNodeRefPath(nodeRef); sb.append("/").append(name);
StringBuilder sb = new StringBuilder(128);
for (NodeRef pathNodeRef : nodeRefPath)
{
String name = (String)nodeService.getProperty(pathNodeRef, ContentModel.PROP_NAME);
sb.append("/").append(name);
}
// Done
extractedData = sb.toString();
} }
return extractedData; // Done
return sb.toString();
} }
} }