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-7051 merge

Browse Source
This commit is contained in:
Ross Gale
2019-11-21 11:08:39 +00:00
parent 9e4586b699 347a2ef9db
commit 8f42f0caf0
1 changed files with 43 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
rm-community/rm-community-repo/source/java/org/alfresco/repo/web/scripts/schedule/UpdateRecordScheduleGet.java
View File

@@ -378,7 +378,9 @@ public class UpdateRecordScheduleGet extends AbstractWebScript implements Record
{ {
int recordCount = 0; int recordCount = 0;
behaviourFilter.disableBehaviour(recordFolder); behaviourFilter.disableBehaviour(ASPECT_FILE_PLAN_COMPONENT);
try
{
if (logger.isDebugEnabled()) if (logger.isDebugEnabled())
{ {
logger.info("Checking folder: " + recordFolder); logger.info("Checking folder: " + recordFolder);
@@ -398,28 +400,29 @@ public class UpdateRecordScheduleGet extends AbstractWebScript implements Record
{ {
if (!nodeService.hasAspect(record, ASPECT_DISPOSITION_LIFECYCLE)) if (!nodeService.hasAspect(record, ASPECT_DISPOSITION_LIFECYCLE))
{ {
if (recordFolder.equals(nodeService.getPrimaryParent(record) if (recordFolder.equals(nodeService.getPrimaryParent(record).getParentRef()))
.getParentRef()))
{ {
if (logger.isDebugEnabled()) if (logger.isDebugEnabled())
{ {
logger.info("updating record: " + record); logger.info("updating record: " + record);
} }
behaviourFilter.disableBehaviour(record);
// update record disposition information
dispositionService.updateNextDispositionAction(record, schedule); dispositionService.updateNextDispositionAction(record, schedule);
innerRecordCount++; innerRecordCount++;
behaviourFilter.enableBehaviour(record);
}
} }
} }
}
} }
return innerRecordCount; return innerRecordCount;
} }
}); });
nodeService.addAspect(recordFolder, ASPECT_DISPOSITION_PROCESSED, null); nodeService.addAspect(recordFolder, ASPECT_DISPOSITION_PROCESSED, null);
behaviourFilter.enableBehaviour(recordFolder); }
finally
{
behaviourFilter.enableBehaviour(ASPECT_FILE_PLAN_COMPONENT);
}
return recordCount; return recordCount;
} }
}, false, true); }, false, true);