inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release/V2.4' into merge-2.5/MergeV24ToV25_a4c106d

Browse Source 
Conflicts:
	rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/DestroyAction.java
	rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/RM1727Test.java
This commit is contained in:
Tuna Aksoy
2016-10-07 14:40:39 +01:00
parent 0614914beb 985c9d06b6
commit cdd02e9c13
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/DestroyAction.java
View File

@@ -181,12 +181,12 @@ public class DestroyAction extends RMDispositionActionExecuterAbstractBase
recordableVersionService.destroyRecordedVersion(version); recordableVersionService.destroyRecordedVersion(version);
} }
// Add the ghosted aspect
getNodeService().addAspect(record, ASPECT_GHOSTED, null);
// Hide from inplace users to give the impression of destruction // Hide from inplace users to give the impression of destruction
inplaceRecordService.hideRecord(record); inplaceRecordService.hideRecord(record);
// Add the ghosted aspect
getNodeService().addAspect(record, ASPECT_GHOSTED, null);
// destroy content // destroy content
contentDestructionComponent.destroyContent(record); contentDestructionComponent.destroyContent(record);
} }

2
rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/RM1727Test.java
View File

@@ -90,7 +90,7 @@ public class RM1727Test extends BaseRMTestCase
return null; return null;
} }
}); });
doTestInTransaction(new Test<Void>() doTestInTransaction(new Test<Void>()
{ {
@Override @Override