Checking if disposition as of date was changed manually.

(cherry picked from commit fd6fcd8e1442102a446971f691e78780cd576674)
This commit is contained in:
roxana
2016-10-21 11:13:51 +03:00
committed by Tom Page
parent 05d14de22b
commit 67ad6b4214

View File

@@ -27,6 +27,8 @@
package org.alfresco.module.org_alfresco_module_rm.disposition;
import static org.apache.commons.lang3.BooleanUtils.isNotTrue;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collection;
@@ -288,10 +290,12 @@ public class DispositionServiceImpl extends ServiceBaseImpl
final NextActionFromDisposition dsNextAction = getDispositionActionByNameForRecord(nodeRef);
if (dsNextAction != null)
{
final NodeRef action = dsNextAction.getNextActionNodeRef();
if (isNotTrue((Boolean)nodeService.getProperty(action, PROP_MANUALLY_SET_AS_OF)))
{
if (!dsNextAction.getWriteMode().equals(WriteMode.READ_ONLY))
{
final NodeRef action = dsNextAction.getNextActionNodeRef();
final String dispositionActionName = dsNextAction.getNextActionName();
final Date dispositionActionDate = dsNextAction.getNextActionDateAsOf();
@@ -309,6 +313,8 @@ public class DispositionServiceImpl extends ServiceBaseImpl
}
});
}
}
dsNodeRef = dsNextAction.getDispositionNodeRef();
}
}