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-6337 Fix failing tests

Browse Source
This commit is contained in:
Roxana Lucanu-Ghetu
2018-05-28 23:53:59 +03:00
parent be7f4b919c
commit 66bbd743cf
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionServiceImpl.java
View File

@@ -814,7 +814,6 @@ public class DispositionServiceImpl extends ServiceBaseImpl
// Get the disposition instructions // Get the disposition instructions
DispositionSchedule di = getDispositionSchedule(nodeRef); DispositionSchedule di = getDispositionSchedule(nodeRef);
NodeRef accessionNodeRef = di.getDispositionActionDefinitionByName("accession").getNodeRef();
DispositionAction nextDa = getNextDispositionAction(nodeRef); DispositionAction nextDa = getNextDispositionAction(nodeRef);
if (di != null && if (di != null &&
this.nodeService.hasAspect(nodeRef, ASPECT_DISPOSITION_LIFECYCLE) && this.nodeService.hasAspect(nodeRef, ASPECT_DISPOSITION_LIFECYCLE) &&
@@ -823,6 +822,7 @@ public class DispositionServiceImpl extends ServiceBaseImpl
Boolean combineSteps = null; Boolean combineSteps = null;
if (nextDa.getName().equals("accession")) if (nextDa.getName().equals("accession"))
{ {
NodeRef accessionNodeRef = di.getDispositionActionDefinitionByName("accession").getNodeRef();
combineSteps = (Boolean)nodeService.getProperty(accessionNodeRef, PROP_COMBINE_DISPOSITION_STEP_CONDITIONS); combineSteps = (Boolean)nodeService.getProperty(accessionNodeRef, PROP_COMBINE_DISPOSITION_STEP_CONDITIONS);
} }