inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-06-16 17:55:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Workflow: fix issue where explicit collection of people (not a group) could not be assigned to a pooled task

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6057 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
David Caruana 2007-06-21 16:44:38 +00:00
parent 55a6e2f287
commit 12e8663942
2 changed files with 58 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
source/java/org/alfresco/repo/workflow/jbpm/AlfrescoAssignment.java
View File

@ -24,6 +24,10 @@
*/
package org.alfresco.repo.workflow.jbpm;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import org.alfresco.model.ContentModel;
import org.alfresco.repo.jscript.ScriptNode;
import org.alfresco.repo.security.authority.AuthorityDAO;
@ -149,6 +153,21 @@ public class AlfrescoAssignment extends JBPMSpringAssignmentHandler
assignedPooledActors[i++] = actor;
}
}
if (eval instanceof Collection)
{
List<String> actors = new ArrayList<String>();
Collection<Object> nodes = (Collection<Object>)eval;
for (Object node : nodes)
{
if (node instanceof ScriptNode)
{
String actor = mapAuthorityToName((ScriptNode)node, true);
actors.add(actor);
}
}
assignedPooledActors = new String[actors.size()];
actors.toArray(assignedPooledActors);
}
else if (eval instanceof ScriptNode)
{
ScriptNode node = (ScriptNode)eval;

45
source/java/org/alfresco/repo/workflow/jbpm/AlfrescoJavaScript.java
View File

@ -24,24 +24,30 @@
*/
package org.alfresco.repo.workflow.jbpm;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import org.alfresco.model.ContentModel;
import org.alfresco.repo.jscript.ScriptNode;
import org.alfresco.repo.jscript.ValueConverter;
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;
import org.alfresco.service.cmr.workflow.WorkflowException;
import org.alfresco.service.namespace.QName;
import org.dom4j.Element;
import org.jbpm.context.def.VariableAccess;
import org.jbpm.context.exe.ContextInstance;
import org.jbpm.graph.exe.ExecutionContext;
import org.jbpm.graph.exe.Token;
import org.jbpm.jpdl.xml.JpdlXmlReader;
import org.mozilla.javascript.Context;
import org.mozilla.javascript.Scriptable;
import org.springframework.beans.factory.BeanFactory;
import org.xml.sax.InputSource;
@ -151,13 +157,40 @@ public class AlfrescoJavaScript extends JBPMSpringActionHandler
Map<String, Object> inputMap = createInputMap(context, services, variableAccesses);
ScriptService scriptService = services.getScriptService();
Object result = scriptService.executeScriptString(expression, inputMap);
if (result instanceof NodeRef)
{
result = new JBPMNode((NodeRef)result, services);
}
result = convertForJBPM(result, services);
return result;
}
/**
* Convert values for JBPM Context
*
* @param value
* @param services
* @return
*/
private static Object convertForJBPM(Object value, ServiceRegistry services)
{
if (value == null)
{
return null;
}
else if (value instanceof NodeRef)
{
value = new JBPMNode(((NodeRef)value), services);
}
else if (value instanceof Collection)
{
// recursively convert each value in the collection
Collection<Object> collection = (Collection<Object>)value;
Collection<Object> converted = new ArrayList<Object>();
for (Object obj : collection)
{
converted.add(convertForJBPM(obj, services));
}
value = converted;
}
return value;
}
/**
* Construct map of arguments to pass to script
@ -285,5 +318,5 @@ public class AlfrescoJavaScript extends JBPMSpringActionHandler
}
return writable;
}
}