mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-07-31 17:39:05 +00:00
RM-3060 - making cut Off action available for record linked to folder with the same disposition schedule
This commit is contained in:
@@ -889,6 +889,13 @@ public class DispositionServiceImpl extends ServiceBaseImpl
|
|||||||
// Get the current action
|
// Get the current action
|
||||||
String currentADId = (String) nodeService.getProperty(currentDispositionAction, PROP_DISPOSITION_ACTION_ID);
|
String currentADId = (String) nodeService.getProperty(currentDispositionAction, PROP_DISPOSITION_ACTION_ID);
|
||||||
currentDispositionActionDefinition = di.getDispositionActionDefinition(currentADId);
|
currentDispositionActionDefinition = di.getDispositionActionDefinition(currentADId);
|
||||||
|
// When the record has multiple disposition schedules the current disposition action may not be found by id
|
||||||
|
// In this case it will be searched by name
|
||||||
|
if(currentDispositionActionDefinition == null)
|
||||||
|
{
|
||||||
|
String currentADName = (String) nodeService.getProperty(currentDispositionAction, PROP_DISPOSITION_ACTION);
|
||||||
|
currentDispositionActionDefinition = di.getDispositionActionDefinitionByName(currentADName);
|
||||||
|
}
|
||||||
|
|
||||||
// Get the next disposition action
|
// Get the next disposition action
|
||||||
int index = currentDispositionActionDefinition.getIndex();
|
int index = currentDispositionActionDefinition.getIndex();
|
||||||
|
Reference in New Issue
Block a user