From 0faa62e500b5896ce754cd95df429c79abd0e3fc Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Fri, 19 Sep 2014 08:34:52 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud) 84673: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud) 84520: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.4) 84406: Merged DEV to V4.1-BUG-FIX (4.1.10). 84324: MNT-12302 Deleting file with versionable aspect via WebDav does not show up in "Manage Deleted Items" in Alfresco Explorer git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@84687 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../alfresco/repo/model/filefolder/FileFolderServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/java/org/alfresco/repo/model/filefolder/FileFolderServiceImpl.java b/source/java/org/alfresco/repo/model/filefolder/FileFolderServiceImpl.java index ebc138726c..3c42d963f3 100644 --- a/source/java/org/alfresco/repo/model/filefolder/FileFolderServiceImpl.java +++ b/source/java/org/alfresco/repo/model/filefolder/FileFolderServiceImpl.java @@ -1660,7 +1660,7 @@ public class FileFolderServiceImpl extends AbstractBaseCopyService implements Fi } if (allVisible) { - nodeService.removeAspect(nodeRef, ContentModel.ASPECT_HIDDEN); + hiddenAspect.showNode(nodeRef, true); } else {