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-1097: Fixed failing tests after Refactoring TransferAction and TransferCompleteAction

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@57964 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Tuna Aksoy
2013-11-18 15:33:24 +00:00
parent 23c9d41bb4
commit b740064f77
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -179,7 +179,7 @@
<!-- Disposition Service --> <!-- Disposition Service -->
<bean id="dispositionService" class="org.alfresco.module.org_alfresco_module_rm.disposition.DispositionServiceImpl" init-method="init"> <bean id="dispositionService" class="org.alfresco.module.org_alfresco_module_rm.disposition.DispositionServiceImpl" init-method="init">
<property name="recordsManagementServiceRegistry" ref="RecordsManagementServiceRegistry"/> <property name="recordsManagementServiceRegistry" ref="RecordsManagementServiceRegistry"/>
<property name="nodeService" ref="NodeService"/> <property name="nodeService" ref="nodeService"/>
<property name="dictionaryService" ref="DictionaryService"/> <property name="dictionaryService" ref="DictionaryService"/>
<property name="behaviourFilter" ref="policyBehaviourFilter" /> <property name="behaviourFilter" ref="policyBehaviourFilter" />
<property name="policyComponent" ref="policyComponent" /> <property name="policyComponent" ref="policyComponent" />
@@ -264,6 +264,7 @@
<property name="dispositionService" ref="DispositionService" /> <property name="dispositionService" ref="DispositionService" />
<property name="recordService" ref="RecordService" /> <property name="recordService" ref="RecordService" />
<property name="recordFolderService" ref="RecordFolderService" /> <property name="recordFolderService" ref="RecordFolderService" />
<property name="nodeService" ref="nodeService"/>
</bean> </bean>
<bean id="RmTransferService" class="org.springframework.aop.framework.ProxyFactoryBean"> <bean id="RmTransferService" class="org.springframework.aop.framework.ProxyFactoryBean">
@@ -307,6 +308,8 @@
<value> <value>
<![CDATA[ <![CDATA[
org.alfresco.module.org_alfresco_module_rm.transfer.TransferService.isTransfer=RM.Read.0 org.alfresco.module.org_alfresco_module_rm.transfer.TransferService.isTransfer=RM.Read.0
org.alfresco.module.org_alfresco_module_rm.transfer.TransferService.transfer=RM.Read.0
org.alfresco.module.org_alfresco_module_rm.transfer.TransferService.complete=RM.Read.0
org.alfresco.module.org_alfresco_module_rm.transfer.TransferService.*=RM_DENY org.alfresco.module.org_alfresco_module_rm.transfer.TransferService.*=RM_DENY
]]> ]]>
</value> </value>

2
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionServiceImpl.java
View File

@@ -275,7 +275,7 @@ public class DispositionServiceImpl implements
{ {
DispositionSchedule di = null; DispositionSchedule di = null;
NodeRef diNodeRef = null; NodeRef diNodeRef = null;
if (serviceRegistry.getRecordService().isRecord(nodeRef) == true) if (recordService.isRecord(nodeRef) == true)
{ {
// Get the record folders for the record // Get the record folders for the record
List<NodeRef> recordFolders = recordFolderService.getRecordFolders(nodeRef); List<NodeRef> recordFolders = recordFolderService.getRecordFolders(nodeRef);