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

Merged HEAD (5.1) to 5.1.N (5.1.1)

Browse Source 
118256 sdinuta: ACE-4699: Document preview is changed to the physical location after "Edit Offline \ Cancel Editing" action


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@118350 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Natalia Smintanca
2015-11-23 11:31:38 +00:00
parent 0423d808db
commit efb26c99dc
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/java/org/alfresco/repo/virtual/bundle/VirtualCheckOutCheckInServiceExtension.java
View File

@@ -144,7 +144,10 @@ public class VirtualCheckOutCheckInServiceExtension extends
@Override @Override
public NodeRef cancelCheckout(NodeRef workingCopyNodeRef) public NodeRef cancelCheckout(NodeRef workingCopyNodeRef)
{ {
return getTrait().cancelCheckout(virtualStore.materializeIfPossible(workingCopyNodeRef)); NodeRef materialOriginalNode = getTrait().cancelCheckout(virtualStore.materializeIfPossible(workingCopyNodeRef));
return virtualizeOriginalIfNeeded(workingCopyNodeRef,
materialOriginalNode);
} }
@Override @Override

12
source/test-java/org/alfresco/repo/virtual/bundle/VirtualCheckOutCheckInServiceExtensionTest.java
View File

@@ -375,4 +375,16 @@ public class VirtualCheckOutCheckInServiceExtensionTest extends VirtualizationIn
sourceAssocs.get(0).getSourceRef()); sourceAssocs.get(0).getSourceRef());
checkOutCheckInService.cancelCheckout(workingCopyVirtualContext); checkOutCheckInService.cancelCheckout(workingCopyVirtualContext);
} }
public void test_ACE_4699() throws Exception
{
checkOutCheckInService.checkout(originalContentNodeRef);
NodeRef workingCopyVirtualContext = nodeService.getChildByName(node,
ContentModel.ASSOC_CONTAINS,
PROP_WORKING_COPY_NAME);
assertNotNull(workingCopyVirtualContext);
NodeRef cancelCheckoutNodeRef = checkOutCheckInService.cancelCheckout(workingCopyVirtualContext);
assertEquals(originalContentNodeRef,
cancelCheckoutNodeRef);
}
} }