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-4681 Fix typo and add behaviour for moving RM items.

Browse Source
This commit is contained in:
Tom Page
2017-02-15 04:03:58 +00:00
parent f7622c0231
commit dee7e2d580
2 changed files with 87 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -59,7 +59,8 @@ import org.alfresco.service.namespace.QName;
)
public class RecordCategoryType extends BaseBehaviourBean
implements NodeServicePolicies.OnCreateChildAssociationPolicy,
NodeServicePolicies.OnCreateNodePolicy
NodeServicePolicies.OnCreateNodePolicy,
NodeServicePolicies.OnMoveNodePolicy
{
/** vital record service */
protected VitalRecordService vitalRecordService;
@@ -178,11 +179,7 @@ public class RecordCategoryType extends BaseBehaviourBean
@Override
public Void doWork()
{
// Check the parent is either a file plan or a category.
if (!isFilePlan(childAssocRef.getParentRef()) && !isRecordCategory(childAssocRef.getParentRef()))
{
throw new AlfrescoRuntimeException("Operation failed: Record categories must go under file plans or categories.");
}
checkParentType(childAssocRef);
// setup record category permissions
filePlanPermissionService.setupRecordCategoryPermissions(childAssocRef.getChildRef());
@@ -218,4 +215,40 @@ public class RecordCategoryType extends BaseBehaviourBean
}
};
}
/** Record category move behaviour. {@inheritDoc} */
@Override
@Behaviour
(
kind = BehaviourKind.CLASS,
notificationFrequency = NotificationFrequency.FIRST_EVENT
)
public void onMoveNode(ChildAssociationRef oldChildAssocRef, ChildAssociationRef newChildAssocRef)
{
checkParentType(newChildAssocRef);
}
/**
* Check the parent of a record category. The parent must be a file plan or another category.
*
* @param childAssocRef The parent-child association.
* @throws UnsupportedOperationException If the parent type is invalid.
*/
private void checkParentType(final ChildAssociationRef childAssocRef)
{
// execute behaviour code as system user
AuthenticationUtil.runAsSystem(new RunAsWork<Void>()
{
@Override
public Void doWork()
{
// Check the parent is either a file plan or a category.
if (!isFilePlan(childAssocRef.getParentRef()) && !isRecordCategory(childAssocRef.getParentRef()))
{
throw new AlfrescoRuntimeException("Operation failed: Record categories must go under file plans or categories.");
}
return null;
}
});
}
}

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

@@ -116,41 +116,36 @@ public class RecordFolderType extends AbstractDisposableItem
)
public void onMoveNode(ChildAssociationRef oldChildAssocRef, ChildAssociationRef newChildAssocRef)
{
if (!nodeService.getType(newChildAssocRef.getParentRef()).equals(TYPE_RECORD_FOLDER))
checkParentType(newChildAssocRef);
if (!oldChildAssocRef.getParentRef().equals(newChildAssocRef.getParentRef()))
{
if (!oldChildAssocRef.getParentRef().equals(newChildAssocRef.getParentRef()))
final NodeRef newNodeRef = newChildAssocRef.getChildRef();
AuthenticationUtil.runAs(new AuthenticationUtil.RunAsWork<Object>()
{
final NodeRef newNodeRef = newChildAssocRef.getChildRef();
AuthenticationUtil.runAs(new AuthenticationUtil.RunAsWork<Object>()
@Override
public Object doWork()
{
@Override
public Object doWork()
// clean record folder
cleanDisposableItem(nodeService, newNodeRef);
// re-initialise the record folder
recordFolderService.setupRecordFolder(newNodeRef);
// sort out the child records
for (NodeRef record : recordService.getRecords(newNodeRef))
{
// clean record folder
cleanDisposableItem(nodeService, newNodeRef);
// clean record
cleanDisposableItem(nodeService, record);
// re-initialise the record folder
recordFolderService.setupRecordFolder(newNodeRef);
// sort out the child records
for (NodeRef record : recordService.getRecords(newNodeRef))
{
// clean record
cleanDisposableItem(nodeService, record);
// Re-initiate the records in the new folder.
recordService.file(record);
}
return null;
// Re-initiate the records in the new folder.
recordService.file(record);
}
}, AuthenticationUtil.getSystemUserName());
}
}
else
{
throw new UnsupportedOperationException("Cannot move record folder into another record folder.");
return null;
}
}, AuthenticationUtil.getSystemUserName());
}
}
@@ -281,6 +276,17 @@ public class RecordFolderType extends AbstractDisposableItem
notificationFrequency = NotificationFrequency.TRANSACTION_COMMIT
)
public void onCreateNode(final ChildAssociationRef childAssocRef)
{
checkParentType(childAssocRef);
}
/**
* Check the parent of a record folder. The primary parent must be a category and a secondary parent may be a hold or a transfer.
*
* @param childAssocRef The parent-child association.
* @throws UnsupportedOperationException If the parent type is invalid.
*/
private void checkParentType(final ChildAssociationRef childAssocRef)
{
// execute behaviour code as system user
AuthenticationUtil.runAsSystem(new RunAsWork<Void>()
@@ -288,12 +294,19 @@ public class RecordFolderType extends AbstractDisposableItem
@Override
public Void doWork()
{
if (childAssocRef.isPrimary())
if (nodeService.getType(childAssocRef.getParentRef()).equals(TYPE_RECORD_FOLDER))
{
// Return slightly more helpful exception in this case.
throw new UnsupportedOperationException("Cannot move record folder into another record folder.");
}
else if (childAssocRef.isPrimary())
{
// Check the primary parent is a category.
if (!isRecordFolder(childAssocRef.getParentRef()))
if (!isRecordCategory(childAssocRef.getParentRef()))
{
throw new AlfrescoRuntimeException("Operation failed: Record folders must go under categories.");
throw new UnsupportedOperationException(
"Operation failed: Record folders must go under categories, not "
+ nodeService.getType(childAssocRef.getParentRef()));
}
}
else
@@ -301,7 +314,9 @@ public class RecordFolderType extends AbstractDisposableItem
// Check the secondary parent is a hold or transfer.
if (!isHold(childAssocRef.getParentRef()) && !isTransfer(childAssocRef.getParentRef()))
{
throw new AlfrescoRuntimeException("Operation failed: Record folders can only have secondary parents of holds or transfers.");
throw new UnsupportedOperationException(
"Operation failed: Record folders can only have secondary parents of holds or transfers, not "
+ nodeService.getType(childAssocRef.getParentRef()));
}
}
return null;