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

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

Browse Source 
121691 adavis: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1) (PARTIAL MERGE)
      121100 amorarasu: Merged DEV to 5.0.N (5.0.4)
         120779 amorarasu: MNT-14416: Click the document uploaded via protocol like AOS in Share site My Activities will take you to a folder view
            - Set null path for newly created files.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123650 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2016-03-11 21:42:48 +00:00
parent fc6f4b71d3
commit 2d6b854cc5
2 changed files with 25 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/java/org/alfresco/repo/webdav/ActivityPosterImpl.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2005-2012 Alfresco Software Limited. * Copyright (C) 2005-2016 Alfresco Software Limited.
* *
* This file is part of Alfresco * This file is part of Alfresco
* *
@@ -73,7 +73,8 @@ public class ActivityPosterImpl implements WebDAVActivityPoster
String path, String path,
FileInfo nodeInfo) throws WebDAVServerException FileInfo nodeInfo) throws WebDAVServerException
{ {
postFileFolderActivity(nodeInfo.isFolder() ? ActivityType.FOLDER_ADDED : ActivityType.FILE_ADDED, siteId, tenantDomain, path, null, nodeInfo); postFileFolderActivity(nodeInfo.isFolder() ? ActivityType.FOLDER_ADDED : ActivityType.FILE_ADDED,
siteId, tenantDomain, nodeInfo.isFolder() ? path : null, null, nodeInfo);
} }
/** /**

23
source/java/org/alfresco/repo/webdav/WebDAVActivityPoster.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2005-2012 Alfresco Software Limited. * Copyright (C) 2005-2016 Alfresco Software Limited.
* *
* This file is part of Alfresco * This file is part of Alfresco
* *
@@ -27,17 +27,38 @@ import org.alfresco.service.cmr.model.FileInfo;
*/ */
public interface WebDAVActivityPoster public interface WebDAVActivityPoster
{ {
/**
* @param siteId
* @param tenantDomain
* @param path the path to the folder or <code>null</code> for files
* @param nodeInfo
* @throws WebDAVServerException
*/
void postFileFolderAdded( void postFileFolderAdded(
String siteId, String siteId,
String tenantDomain, String tenantDomain,
String path, String path,
FileInfo nodeInfo) throws WebDAVServerException; FileInfo nodeInfo) throws WebDAVServerException;
/**
* @param siteId
* @param tenantDomain
* @param nodeInfo
* @throws WebDAVServerException
*/
void postFileFolderUpdated( void postFileFolderUpdated(
String siteId, String siteId,
String tenantDomain, String tenantDomain,
FileInfo nodeInfo) throws WebDAVServerException; FileInfo nodeInfo) throws WebDAVServerException;
/**
* @param siteId
* @param tenantDomain
* @param parentPath
* @param parentNodeInfo
* @param contentNodeInfo
* @throws WebDAVServerException
*/
void postFileFolderDeleted( void postFileFolderDeleted(
String siteId, String siteId,
String tenantDomain, String tenantDomain,