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

Merge branch 'feature/RM-7028_Add_Add_To_Hold_ToAudit' into feature/RM-7029_RemoveFromHold

Browse Source
This commit is contained in:
Chris Shields
2019-11-19 12:14:04 +00:00
parent ad963bb24e 8140859d03
commit 4a89c38f2d
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/extractor/NamePathDataExtractor.java
View File

@@ -51,8 +51,9 @@ import org.alfresco.service.cmr.security.PermissionService;
* @see FilePlanService#getNodeRefPath(NodeRef) * @see FilePlanService#getNodeRefPath(NodeRef)
* *
* @author Derek Hulley * @author Derek Hulley
* @since 3.2
* @author Sara Aspery * @author Sara Aspery
* @since 3.3 * @since AGS 3.3
*/ */
public final class NamePathDataExtractor extends AbstractDataExtractor public final class NamePathDataExtractor extends AbstractDataExtractor
{ {

6
rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/CommonRMTestUtils.java
View File

@@ -345,7 +345,8 @@ public class CommonRMTestUtils implements RecordsManagementModel
nodeService.setProperty(record, RecordsManagementModel.PROP_DATE_FILED, new Date()); nodeService.setProperty(record, RecordsManagementModel.PROP_DATE_FILED, new Date());
nodeService.setProperty(record, ContentModel.PROP_TITLE, "titleValue"); nodeService.setProperty(record, ContentModel.PROP_TITLE, "titleValue");
actionService.executeRecordsManagementAction(record, "declareRecord"); actionService.executeRecordsManagementAction(record, "declareRecord");
} finally }
finally
{ {
modelSecurityService.setEnabled(true); modelSecurityService.setEnabled(true);
} }
@@ -368,7 +369,8 @@ public class CommonRMTestUtils implements RecordsManagementModel
try try
{ {
actionService.executeRecordsManagementAction(recordFolder, "closeRecordFolder"); actionService.executeRecordsManagementAction(recordFolder, "closeRecordFolder");
} finally }
finally
{ {
modelSecurityService.setEnabled(true); modelSecurityService.setEnabled(true);
} }