RM-2526 Merge release/V2.5 into master.

This commit is contained in:
Tom Page
2016-10-31 16:18:15 +00:00
3 changed files with 15 additions and 198 deletions

View File

@@ -287,7 +287,15 @@ public class DispositionServiceImpl extends ServiceBaseImpl
NodeRef dsNodeRef = null;
if (isRecord(nodeRef))
{
DispositionSchedule originDispositionSchedule = getOriginDispositionSchedule(nodeRef);
// calculate disposition schedule without taking into account the user
DispositionSchedule originDispositionSchedule = AuthenticationUtil.runAsSystem(new RunAsWork<DispositionSchedule>()
{
@Override
public DispositionSchedule doWork()
{
return getOriginDispositionSchedule(nodeRef);
}
});
// if the initial disposition schedule of the record is folder based
if (originDispositionSchedule == null ||
isNotTrue(originDispositionSchedule.isRecordLevelDisposition()))