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 Code review changes

Browse Source
This commit is contained in:
Roxana Lucanu-Ghetu
2018-05-30 09:38:25 +03:00
parent 758ae020bd
commit 1ece45f834
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -824,9 +824,10 @@ public class DispositionServiceImpl extends ServiceBaseImpl
{ {
NodeRef accessionNodeRef = di.getDispositionActionDefinitionByName("accession").getNodeRef(); NodeRef accessionNodeRef = di.getDispositionActionDefinitionByName("accession").getNodeRef();
if (accessionNodeRef != null) { if (accessionNodeRef != null) {
if (this.nodeService.getProperty(accessionNodeRef, PROP_COMBINE_DISPOSITION_STEP_CONDITIONS) != null) Boolean combineStepsProp = (Boolean)this.nodeService.getProperty(accessionNodeRef, PROP_COMBINE_DISPOSITION_STEP_CONDITIONS);
if (combineStepsProp != null)
{ {
combineSteps = (Boolean)this.nodeService.getProperty(accessionNodeRef, PROP_COMBINE_DISPOSITION_STEP_CONDITIONS); combineSteps = combineStepsProp;
} }
} }
} }
@@ -834,7 +835,7 @@ public class DispositionServiceImpl extends ServiceBaseImpl
Boolean asOfDateInPast = false; Boolean asOfDateInPast = false;
if (asOf != null) if (asOf != null)
{ {
asOfDateInPast = ((Date) this.nodeService.getProperty(nextDa.getNodeRef(), PROP_DISPOSITION_AS_OF)).before(new Date()); asOfDateInPast = asOf.before(new Date());
} }
if (asOfDateInPast && !combineSteps) if (asOfDateInPast && !combineSteps)
{ {