RM-623: Unable to rename record folder

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@47783 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Roy Wetherall
2013-03-08 03:58:24 +00:00
parent 3877220922
commit 24838caf0c
2 changed files with 49 additions and 75 deletions

View File

@@ -236,37 +236,4 @@
</value>
</property>
</bean>
<!-- Site Service -->
<!-- <bean id="siteService" class="org.alfresco.repo.site.ExtendedSiteServiceImpl" init-method="init">
<property name="nodeService" ref="NodeService"/>
<property name="directNodeService" ref="nodeService"/>
<property name="fileFolderService" ref="FileFolderService"/>
<property name="searchService" ref="SearchService"/>
<property name="namespaceService" ref="NamespaceService"/>
<property name="permissionService" ref="PermissionService"/>
<property name="authenticationContext" ref="authenticationContext"/>
<property name="personService" ref="PersonService"/>
<property name="activityService" ref="activityService"/>
<property name="taggingService" ref="TaggingService"/>
<property name="authorityService" ref="authorityService"/>
<property name="dictionaryService" ref="DictionaryService"/>
<property name="tenantAdminService" ref="tenantAdminService"/>
<property name="transactionHelper" ref="retryingTransactionHelper"/>
<property name="sitesXPath">
<value>./${spaces.company_home.childname}/st:sites</value>
</property>
<property name="tenantService" ref="tenantService"/>
<property name="roleComparator" ref="siteRoleComparator" />
<property name="sysAdminParams" ref="sysAdminParams"/>
<property name="behaviourFilter" ref="policyBehaviourFilter" />
<property name="sitesPermissionsCleaner" ref="sitesPermissionsCleaner"/>
<property name="cannedQueryRegistry" ref="siteCannedQueryRegistry"/>
<property name="policyComponent" ref="policyComponent"/>
<property name="publicServiceAccessService" ref="PublicServiceAccessService" />
<property name="recordsManagementService" ref="RecordsManagementService" />
</bean>
-->
</beans>

View File

@@ -118,6 +118,9 @@ public class RecordCopyBehaviours implements RecordsManagementModel
* @param newChildAssocRef
*/
public void onMoveRecordNode(ChildAssociationRef oldChildAssocRef, ChildAssociationRef newChildAssocRef)
{
// check the records parent has actually changed
if (oldChildAssocRef.getParentRef().equals(newChildAssocRef.getParentRef()) == false)
{
final NodeRef newNodeRef = newChildAssocRef.getChildRef();
final NodeService nodeService = rmServiceRegistry.getNodeService();
@@ -136,6 +139,7 @@ public class RecordCopyBehaviours implements RecordsManagementModel
}
}, AuthenticationUtil.getAdminUserName());
}
}
/**
* onMove record folder behaviour
@@ -145,6 +149,8 @@ public class RecordCopyBehaviours implements RecordsManagementModel
*/
@SuppressWarnings("unused")
public void onMoveRecordFolderNode(ChildAssociationRef oldChildAssocRef, ChildAssociationRef newChildAssocRef)
{
if (oldChildAssocRef.getParentRef().equals(newChildAssocRef.getParentRef()) == false)
{
final NodeRef newNodeRef = newChildAssocRef.getChildRef();
final NodeService nodeService = rmServiceRegistry.getNodeService();
@@ -181,6 +187,7 @@ public class RecordCopyBehaviours implements RecordsManagementModel
}
}, AuthenticationUtil.getAdminUserName());
}
}
/**
* Removes unwanted aspects