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

Merge branch 'feature-2.5/RM-4689_Can_delete_RM_site_content_in_browser' into merge/RM_25

Browse Source 
Conflicts:
	rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-fileplan-context.xml
	rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-model-context.xml
	rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/BaseBehaviourBean.java
	rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/FilePlanType.java
	rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/HoldContainerType.java
	rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RecordCategoryType.java
	rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RmSiteType.java
	rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/TransferContainerType.java
	rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/TransferType.java
	rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/UnfiledRecordContainerType.java
	rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/transfer/TransferServiceImpl.java
	rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/RM4293Test.java
	rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/TransferContainerTypeUnitTest.java
This commit is contained in:
Tuna Aksoy
2017-06-12 21:03:15 +01:00
parent f4cdbf12e1 06a48d73cd
commit 64892424b2
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-model-context.xml
View File

@@ -76,7 +76,7 @@
<property name="filePlanService" ref="FilePlanService" />
<property name="recordFolderService" ref="RecordFolderService" />
<property name="filePlanRoleService" ref="FilePlanRoleService" />
<property name="unfilerRecordContainerType" ref="rma.unfiledRecordsContainer" />
<property name="unfiledRecordContainerType" ref="rma.unfiledRecordsContainer" />
<property name="transferContainerType" ref="rma.transferContainer" />
<property name="holdContainerType" ref="rma.holdContainer" />
</bean>

14
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/FilePlanType.java
View File

@@ -85,7 +85,7 @@ public class FilePlanType extends BaseBehaviourBean
/**
* Unfiled Record Container Type behaviour bean
*/
private UnfiledRecordContainerType unfilerRecordContainerType;
private UnfiledRecordContainerType unfiledRecordContainerType;
/**
* Transfer Container Type behaviour bean
@@ -162,11 +162,11 @@ public class FilePlanType extends BaseBehaviourBean
}
/**
* @param unfilerRecordContainerType - unfiled record container type behaviour bean
* @param unfiledRecordContainerType - unfiled record container type behaviour bean
*/
public void setUnfilerRecordContainerType(UnfiledRecordContainerType unfilerRecordContainerType)
public void setUnfiledRecordContainerType(UnfiledRecordContainerType unfiledRecordContainerType)
{
this.unfilerRecordContainerType = unfilerRecordContainerType;
this.unfiledRecordContainerType = unfiledRecordContainerType;
}
/**
@@ -273,7 +273,7 @@ public class FilePlanType extends BaseBehaviourBean
)
public void onDeleteNode(ChildAssociationRef childAssocRef, boolean archived)
{
unfilerRecordContainerType.enable();
unfiledRecordContainerType.enable();
transferContainerType.enable();
holdContainerType.enable();
throw new IntegrityException("Operation failed. Deletion of File Plan is not allowed.", null);
@@ -290,7 +290,7 @@ public class FilePlanType extends BaseBehaviourBean
)
public void beforeDeleteNode(NodeRef nodeRef)
{
unfilerRecordContainerType.disable();
unfiledRecordContainerType.disable();
transferContainerType.disable();
holdContainerType.disable();
}
@@ -305,7 +305,7 @@ public class FilePlanType extends BaseBehaviourBean
{
// tear down the file plan roles
getFilePlanRoleService().tearDownFilePlanRoles(childAssocRef.getChildRef());
unfilerRecordContainerType.enable();
unfiledRecordContainerType.enable();
transferContainerType.enable();
holdContainerType.enable();
}