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

Merged release/V2.5 and addressed review comments

Browse Source
This commit is contained in:
Tuna Aksoy
2017-06-12 16:41:30 +01:00
parent 1712bac995
commit 06a48d73cd
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="filePlanService" ref="FilePlanService" />
<property name="recordFolderService" ref="RecordFolderService" /> <property name="recordFolderService" ref="RecordFolderService" />
<property name="filePlanRoleService" ref="FilePlanRoleService" /> <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="transferContainerType" ref="rma.transferContainer"/>
<property name="holdContainerType" ref="rma.holdContainer"/> <property name="holdContainerType" ref="rma.holdContainer"/>
</bean> </bean>

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

@@ -84,7 +84,7 @@ public class FilePlanType extends BaseBehaviourBean
/** /**
* Unfiled Record Container Type behaviour bean * Unfiled Record Container Type behaviour bean
*/ */
private UnfiledRecordContainerType unfilerRecordContainerType; private UnfiledRecordContainerType unfiledRecordContainerType;
/** /**
* Transfer Container Type behaviour bean * Transfer Container Type behaviour bean
@@ -161,11 +161,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;
} }
/** /**
@@ -267,7 +267,7 @@ public class FilePlanType extends BaseBehaviourBean
name = BEHAVIOUR_NAME) name = BEHAVIOUR_NAME)
public void onDeleteNode(ChildAssociationRef childAssocRef, boolean archived) public void onDeleteNode(ChildAssociationRef childAssocRef, boolean archived)
{ {
unfilerRecordContainerType.enable(); unfiledRecordContainerType.enable();
transferContainerType.enable(); transferContainerType.enable();
holdContainerType.enable(); holdContainerType.enable();
throw new IntegrityException("Operation failed. Deletion of File Plan is not allowed.", null); throw new IntegrityException("Operation failed. Deletion of File Plan is not allowed.", null);
@@ -281,7 +281,7 @@ public class FilePlanType extends BaseBehaviourBean
notificationFrequency = NotificationFrequency.FIRST_EVENT) notificationFrequency = NotificationFrequency.FIRST_EVENT)
public void beforeDeleteNode(NodeRef nodeRef) public void beforeDeleteNode(NodeRef nodeRef)
{ {
unfilerRecordContainerType.disable(); unfiledRecordContainerType.disable();
transferContainerType.disable(); transferContainerType.disable();
holdContainerType.disable(); holdContainerType.disable();
} }
@@ -293,7 +293,7 @@ public class FilePlanType extends BaseBehaviourBean
{ {
// tear down the file plan roles // tear down the file plan roles
getFilePlanRoleService().tearDownFilePlanRoles(childAssocRef.getChildRef()); getFilePlanRoleService().tearDownFilePlanRoles(childAssocRef.getChildRef());
unfilerRecordContainerType.enable(); unfiledRecordContainerType.enable();
transferContainerType.enable(); transferContainerType.enable();
holdContainerType.enable(); holdContainerType.enable();
} }