mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-07-24 17:32:48 +00:00
Merged 1.4 to HEAD
svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4316 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4317 . svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4319 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4328 . git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4652 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -21,9 +21,11 @@ import java.util.Iterator;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import org.alfresco.model.ContentModel;
|
||||
import org.alfresco.repo.jscript.Classification;
|
||||
import org.alfresco.repo.jscript.Search;
|
||||
import org.alfresco.repo.jscript.Session;
|
||||
import org.alfresco.repo.security.authentication.AuthenticationUtil;
|
||||
import org.alfresco.service.ServiceRegistry;
|
||||
import org.alfresco.service.cmr.repository.NodeRef;
|
||||
import org.alfresco.service.cmr.repository.ScriptService;
|
||||
@@ -155,7 +157,18 @@ public class AlfrescoJavaScript extends JBPMSpringActionHandler
|
||||
inputMap.put("session", new Session(services, null));
|
||||
inputMap.put("classification", new Classification(services, companyHomeRef.getStoreRef(), null));
|
||||
}
|
||||
|
||||
String userName = AuthenticationUtil.getCurrentUserName();
|
||||
NodeRef person = services.getPersonService().getPerson(userName);
|
||||
if (person != null)
|
||||
{
|
||||
inputMap.put("person", new JBPMNode(person, services));
|
||||
NodeRef homeSpace = (NodeRef)services.getNodeService().getProperty(person, ContentModel.PROP_HOMEFOLDER);
|
||||
if (homeSpace != null)
|
||||
{
|
||||
inputMap.put("userhome", new JBPMNode(homeSpace, services));
|
||||
}
|
||||
}
|
||||
|
||||
// initialise process variables
|
||||
Token token = executionContext.getToken();
|
||||
inputMap.put("executionContext", executionContext);
|
||||
|
Reference in New Issue
Block a user