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

Checking if disposition as of date was changed manually.

Browse Source 
(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
1 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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