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

Merge branch 'feature/RM-7035_AddPoliciesForHolds' into feature/RM-7026_Add_HoldCreated_ToAudit

Browse Source
This commit is contained in:
Sara Aspery
2019-10-29 15:01:33 +00:00
parent 5703b91955 9571f31565
commit 91324f0fd3
10 changed files with 82 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/hold/HoldServiceImpl.java
View File

@@ -28,6 +28,7 @@
package org.alfresco.module.org_alfresco_module_rm.hold;
import static org.alfresco.model.ContentModel.ASPECT_LOCKABLE;
import static org.alfresco.model.ContentModel.PROP_NAME;
import java.io.Serializable;
import java.util.ArrayList;
@@ -41,7 +42,6 @@ import java.util.Set;
import org.alfresco.error.AlfrescoRuntimeException;
import org.alfresco.model.ContentModel;
import org.alfresco.module.org_alfresco_module_rm.RecordsManagementPolicies.BeforeFileRecord;
import org.alfresco.module.org_alfresco_module_rm.audit.RecordsManagementAuditService;
import org.alfresco.module.org_alfresco_module_rm.audit.event.AuditEvent;
import org.alfresco.module.org_alfresco_module_rm.capability.CapabilityService;
@@ -253,7 +253,6 @@ public class HoldServiceImpl extends ServiceBaseImpl
transactionalResourceHelper.getSet("frozen").add(frozenNode);
removeFreezeAspect(frozenNode, 1);
}
return null;
}
};
@@ -571,10 +570,14 @@ public class HoldServiceImpl extends ServiceBaseImpl
}
invokeBeforeDeleteHold(hold);
String holdName = (String) nodeService.getProperty(hold, PROP_NAME);
Set<QName> classQNames = getTypeAndApsects(hold);
// delete the hold node
nodeService.deleteNode(hold);
//invokeOnDeleteHold(hold);
invokeOnDeleteHold(holdName, classQNames);
}
/**
@@ -902,12 +905,15 @@ public class HoldServiceImpl extends ServiceBaseImpl
/**
* Invoke onDeleteHold policy
*
* @param nodeRef node reference
* @param holdName name of the hold
* @param classQNames hold types and aspects
*/
protected void invokeOnDeleteHold(NodeRef nodeRef)
protected void invokeOnDeleteHold(String holdName, Set<QName> classQNames)
{
// execute policy for node type and aspects
OnDeleteHoldPolicy policy = onDeleteHoldPolicyDelegate.get(getTypeAndApsects(nodeRef));
policy.onDeleteHold(nodeRef);
OnDeleteHoldPolicy policy = onDeleteHoldPolicyDelegate.get(classQNames);
policy.onDeleteHold(holdName);
}
}

4
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/hold/HoldServicePolicies.java
View File

@@ -82,8 +82,8 @@ public interface HoldServicePolicies
/**
* Called when a hold is deleted.
*
* @param hold node reference
* @param holdname name of the deleted hold
*/
void onDeleteHold(NodeRef hold);
void onDeleteHold(String holdname);
}
}