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

Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)

Browse Source 
75092: Merged WAT2 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      74393: Removed the extra step when posting activities, its now enhanced from the queue.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@75421 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Will Abson
2014-07-01 15:32:27 +00:00
parent 71352485d3
commit 5adf37ba71
2 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/alfresco/subsystems/ActivitiesFeed/default/activities-feed-context.xml
View File

@@ -10,7 +10,6 @@
<property name="tenantService" ref="tenantService"/> <property name="tenantService" ref="tenantService"/>
<property name="userNamesAreCaseSensitive" value="${user.name.caseSensitive}"/> <property name="userNamesAreCaseSensitive" value="${user.name.caseSensitive}"/>
<property name="eventPublisher" ref="eventPublisher" /> <property name="eventPublisher" ref="eventPublisher" />
<property name="fileFolderService" ref="FileFolderService"/>
</bean> </bean>
<bean id="activityService" class="org.alfresco.repo.activities.ActivityServiceImpl"> <bean id="activityService" class="org.alfresco.repo.activities.ActivityServiceImpl">

17
source/java/org/alfresco/repo/activities/ActivityPostServiceImpl.java
View File

@@ -32,7 +32,6 @@ import org.alfresco.repo.events.EventPublisher;
import org.alfresco.repo.security.authentication.AuthenticationUtil; import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.repo.tenant.TenantService; import org.alfresco.repo.tenant.TenantService;
import org.alfresco.service.cmr.activities.ActivityPostService; import org.alfresco.service.cmr.activities.ActivityPostService;
import org.alfresco.service.cmr.model.FileFolderService;
import org.alfresco.service.cmr.model.FileInfo; import org.alfresco.service.cmr.model.FileInfo;
import org.alfresco.service.cmr.repository.ContentData; import org.alfresco.service.cmr.repository.ContentData;
import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeRef;
@@ -58,7 +57,6 @@ public class ActivityPostServiceImpl implements ActivityPostService
private ActivityPostDAO postDAO; private ActivityPostDAO postDAO;
private TenantService tenantService; private TenantService tenantService;
private EventPublisher eventPublisher; private EventPublisher eventPublisher;
private FileFolderService fileFolderService;
private int estGridSize = 1; private int estGridSize = 1;
@@ -89,10 +87,6 @@ public class ActivityPostServiceImpl implements ActivityPostService
this.eventPublisher = eventPublisher; this.eventPublisher = eventPublisher;
} }
public void setFileFolderService(FileFolderService fileFolderService)
{
this.fileFolderService = fileFolderService;
}
/* (non-Javadoc) /* (non-Javadoc)
* @see org.alfresco.service.cmr.activities.ActivityService#postActivity(java.lang.String, java.lang.String, java.lang.String, java.lang.String) * @see org.alfresco.service.cmr.activities.ActivityService#postActivity(java.lang.String, java.lang.String, java.lang.String, java.lang.String)
*/ */
@@ -297,15 +291,14 @@ public class ActivityPostServiceImpl implements ActivityPostService
String nodeId = finalNodeRef!=null?finalNodeRef.getId():null; String nodeId = finalNodeRef!=null?finalNodeRef.getId():null;
FileInfo fileInfo = contentNodeInfo; FileInfo fileInfo = contentNodeInfo;
//Get content info if available
if (fileInfo == null && finalNodeRef !=null)
{
fileInfo = fileFolderService.getFileInfo(finalNodeRef);
}
//Use content info //Use content info
if (fileInfo != null) if (fileInfo != null)
{ {
if (logger.isDebugEnabled())
{
logger.debug("Enhancing the Activity Event with fileInfo provided for node "+nodeId);
}
if (nodeId == null) if (nodeId == null)
{ {
nodeId = fileInfo.getNodeRef().getId(); nodeId = fileInfo.getNodeRef().getId();