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-4247 Merge release/V2.3 into feature-2.3/RM-4247_UpdateDispositionProperty.

Browse Source
This commit is contained in:
Tom Page
2016-11-04 11:09:17 +00:00
parent c79463d96c 7e105f40f9
commit 43b8f3eba1
28 changed files with 1600 additions and 1155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/record/RecordServiceImplUnitTest.java
View File

@@ -263,7 +263,7 @@ public class RecordServiceImplUnitTest extends BaseUnitTest
DispositionSchedule recordDispositionSchedule = mock(DispositionSchedule.class);
when(recordDispositionSchedule.isRecordLevelDisposition())
.thenReturn(true);
when(mockedDispositionService.getDispositionSchedule(record))
when(mockedDispositionService.getOriginDispositionSchedule(record))
.thenReturn(recordDispositionSchedule);
DispositionSchedule recordFolderDispositionSchedule = mock(DispositionSchedule.class);