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

82373: Merged WAT2 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      76479: Supporting Client class from alfresco-events


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@83217 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Erik Winlof
2014-09-04 06:50:19 +00:00
parent 6575029ee5
commit a8aac98030
7 changed files with 18 additions and 14 deletions

View File

@@ -20,13 +20,14 @@ package org.alfresco.repo.activities.script;
import java.util.List;
import org.alfresco.repo.Client;
import org.alfresco.repo.Client.ClientType;
import org.alfresco.repo.jscript.BaseScopableProcessorExtension;
import org.alfresco.repo.tenant.TenantService;
import org.alfresco.service.cmr.activities.ActivityService;
import org.alfresco.service.cmr.activities.FeedControl;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.namespace.QName;
import org.alfresco.util.FileFilterMode.Client;
import org.mozilla.javascript.Context;
import org.mozilla.javascript.Scriptable;
@@ -73,7 +74,7 @@ public final class Activity extends BaseScopableProcessorExtension
*/
public void postActivity(String activityType, String siteId, String appTool, String jsonActivityData)
{
activityService.postActivity(activityType, siteId, appTool, jsonActivityData, Client.webclient);
activityService.postActivity(activityType, siteId, appTool, jsonActivityData, Client.asType(ClientType.webclient));
}
/**