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-QA to HEAD (4.2) (including moving test classes into separate folders)

Browse Source 
51903 to 54309 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@54310 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Samuel Langlois
2013-08-20 17:17:31 +00:00
parent 0a36e2af67
commit ab4ca7177f
1576 changed files with 36419 additions and 8603 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/java/org/alfresco/repo/workflow/jscript/JscriptWorkflowTask.java
View File

@@ -36,6 +36,7 @@ import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.cmr.repository.StoreRef;
import org.alfresco.service.cmr.security.MutableAuthenticationService;
import org.alfresco.service.cmr.workflow.WorkflowNode;
import org.alfresco.service.cmr.workflow.WorkflowService;
import org.alfresco.service.cmr.workflow.WorkflowTask;
import org.alfresco.service.cmr.workflow.WorkflowTaskState;
@@ -207,9 +208,13 @@ public class JscriptWorkflowTask extends BaseScopableProcessorExtension implemen
public ScriptableHashMap<String, String> getTransitions()
{
ScriptableHashMap<String, String> transitions = new ScriptableHashMap<String, String>();
for (WorkflowTransition transition : task.getPath().getNode().getTransitions())
WorkflowNode workflowNode = task.getPath().getNode();
if (workflowNode != null)
{
transitions.put(transition.getId(), transition.getTitle());
for (WorkflowTransition transition : workflowNode.getTransitions())
{
transitions.put(transition.getId(), transition.getTitle());
}
}
return transitions;
}

12
source/java/org/alfresco/repo/workflow/jscript/WorkflowManager.java
View File

@@ -44,6 +44,8 @@ import org.mozilla.javascript.Scriptable;
*/
public class WorkflowManager extends BaseScopableProcessorExtension
{
/** The maximum number of reviewers for "Group Review and Approve" workflow */
private int maxGroupReviewers = 0;
/** Registry Service property */
private ServiceRegistry services;
@@ -57,6 +59,16 @@ public class WorkflowManager extends BaseScopableProcessorExtension
this.services = services;
}
public void setMaxGroupReviewers(int maxGroupReviewers)
{
this.maxGroupReviewers = maxGroupReviewers;
}
public int getMaxGroupReviewers()
{
return maxGroupReviewers;
}
/**
* Get deployed workflow definition by ID
*