inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added "message", "priority", "dueDate", "context" and "package" properties to the SimpleWorkflowInstanceResponse.

Browse Source 
Unfortunately, priority and dueDate can not be retrieved from the WorkflowInstance in the Java API so they are hardcoded until that issue can be resolved.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@22119 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Gavin Cornwell
2010-09-01 12:45:53 +00:00
parent 915f85a6ab
commit 703733d68f
3 changed files with 33 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
source/java/org/alfresco/repo/web/scripts/workflow/WorkflowModelBuilder.java
View File

@@ -98,6 +98,7 @@ public class WorkflowModelBuilder
public static final String TASK_WORKFLOW_INSTANCE_TYPE = "type";
public static final String TASK_WORKFLOW_INSTANCE_TITLE = "title";
public static final String TASK_WORKFLOW_INSTANCE_DESCRIPTION = "description";
public static final String TASK_WORKFLOW_INSTANCE_MESSAGE = "message";
public static final String TASK_WORKFLOW_INSTANCE_IS_ACTIVE = "isActive";
public static final String TASK_WORKFLOW_INSTANCE_START_DATE = "startDate";
public static final String TASK_WORKFLOW_INSTANCE_DUE_DATE = "dueDate";
@@ -235,7 +236,18 @@ public class WorkflowModelBuilder
model.put(TASK_WORKFLOW_INSTANCE_TITLE, workflowInstance.getDefinition().getTitle());
model.put(TASK_WORKFLOW_INSTANCE_DESCRIPTION, workflowInstance.getDefinition().getDescription());
model.put(TASK_WORKFLOW_INSTANCE_IS_ACTIVE, workflowInstance.isActive());
model.put(TASK_WORKFLOW_INSTANCE_DEFINITION_URL, getUrl(workflowInstance.getDefinition()));
if (workflowInstance.getWorkflowPackage() != null)
{
model.put(TASK_WORKFLOW_INSTANCE_PACKAGE, workflowInstance.getWorkflowPackage().toString());
}
if (workflowInstance.getContext() != null)
{
model.put(TASK_WORKFLOW_INSTANCE_CONTEXT, workflowInstance.getContext().toString());
}
if (workflowInstance.getStartDate() == null)
{
model.put(TASK_WORKFLOW_INSTANCE_START_DATE, workflowInstance.getStartDate());
@@ -262,7 +274,19 @@ public class WorkflowModelBuilder
{
model.put(TASK_WORKFLOW_INSTANCE_INITIATOR, getPersonModel(nodeService.getProperty(workflowInstance.initiator, ContentModel.PROP_USERNAME)));
}
model.put(TASK_WORKFLOW_INSTANCE_DEFINITION_URL, getUrl(workflowInstance.getDefinition()));
// TODO: Try and retrieve these from the workflow instance to save the need to
// do an extra query which makes things slow
model.put(TASK_WORKFLOW_INSTANCE_PRIORITY, 2);
model.put(TASK_WORKFLOW_INSTANCE_DUE_DATE, null);
if (workflowInstance.getDescription() != null)
{
model.put(TASK_WORKFLOW_INSTANCE_MESSAGE, workflowInstance.description);
}
else
{
model.put(TASK_WORKFLOW_INSTANCE_MESSAGE, workflowInstance.getDefinition().getTitle());
}
return model;
}
@@ -299,13 +323,11 @@ public class WorkflowModelBuilder
model.put(TASK_WORKFLOW_INSTANCE_DUE_DATE, dueDate);
}
if (workflowInstance.context != null)
if (priority != null)
{
model.put(TASK_WORKFLOW_INSTANCE_CONTEXT, workflowInstance.context.toString());
model.put(TASK_WORKFLOW_INSTANCE_PRIORITY, priority);
}
model.put(TASK_WORKFLOW_INSTANCE_PRIORITY, priority);
model.put(TASK_WORKFLOW_INSTANCE_PACKAGE, workflowInstance.workflowPackage.toString());
model.put(TASK_WORKFLOW_INSTANCE_START_TASK_INSTANCE_ID, startTaskId);
model.put(TASK_WORKFLOW_INSTANCE_DEFINITION, buildDetailed(workflowInstance.definition));

1
source/java/org/alfresco/repo/web/scripts/workflow/WorkflowModelBuilderTest.java
View File

@@ -351,6 +351,7 @@ public class WorkflowModelBuilderTest extends TestCase
path.instance.id = "";
path.instance.active = true;
path.instance.startDate = new Date();
path.instance.workflowPackage = workflowPackage;
path.instance.definition = new WorkflowDefinition(
"The Id", "The Name", "1", "The Title", "The Description", null);
return path;