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

Integrated WorkflowFormProcessor into new Start Workflow page.

Browse Source 
WorkflowFormProcessor now also accepts 'package items' and starts the workflow with them, still limited in functionality (only description is read) as this implementation will be replaced shortly with an implementation based on the new re-factored form processors.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@21031 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Gavin Cornwell
2010-07-09 12:12:01 +00:00
parent a2f410e5a2
commit 395aa2a32a
3 changed files with 65 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
source/java/org/alfresco/repo/forms/FormServiceImplTest.java
View File

@@ -1234,9 +1234,9 @@ public class FormServiceImplTest extends BaseAlfrescoSpringTest
// a legitimate set of fields for the workflow
List<String> fields = new ArrayList<String>(8);
fields.add("bpm:taskId");
fields.add("bpm:description");
fields.add("bpm:workflowDescription");
fields.add("bpm:workflowDueDate");
//fields.add("packageItems");
fields.add("packageItems");
String workflowDefName = "jbpm$wf:adhoc";
Form form = this.formService.getForm(new Item(WORKFLOW_FORM_ITEM_KIND, workflowDefName), fields);
@@ -1262,15 +1262,15 @@ public class FormServiceImplTest extends BaseAlfrescoSpringTest
// find the fields
PropertyFieldDefinition idField = (PropertyFieldDefinition)fieldDefMap.get("bpm:taskId");
PropertyFieldDefinition descriptionField = (PropertyFieldDefinition)fieldDefMap.get("bpm:description");
PropertyFieldDefinition descriptionField = (PropertyFieldDefinition)fieldDefMap.get("bpm:workflowDescription");
PropertyFieldDefinition dueDateField = (PropertyFieldDefinition)fieldDefMap.get("bpm:workflowDueDate");
//AssociationFieldDefinition packageItemsField = (AssociationFieldDefinition)fieldDefMap.get("packageItems");
AssociationFieldDefinition packageItemsField = (AssociationFieldDefinition)fieldDefMap.get("packageItems");
// check fields are present
assertNotNull("Expecting to find the bpm:taskId field", idField);
assertNotNull("Expecting to find the bpm:description field", descriptionField);
assertNotNull("Expecting to find the bpm:workflowDescription field", descriptionField);
assertNotNull("Expecting to find the bpm:workflowDueDate field", dueDateField);
//assertNotNull("Expecting to find the packageItems field", packageItemsField);
assertNotNull("Expecting to find the packageItems field", packageItemsField);
// get the number of tasks now
List<WorkflowTask> tasks = this.workflowService.getAssignedTasks(USER_ONE,
@@ -1279,10 +1279,10 @@ public class FormServiceImplTest extends BaseAlfrescoSpringTest
// persist the form
FormData data = new FormData();
data.addFieldData("prop_bpm_description", "This is a new adhoc task");
data.addFieldData("prop_bpm_workflowDescription", "This is a new adhoc task");
data.addFieldData("assoc_bpm_assignee_added",
this.personService.getPerson(USER_ONE).toString());
//data.addFieldData("packageItems_added", this.document.toString());
data.addFieldData("assoc_packageItems_added", this.document.toString());
// persist the data
WorkflowInstance workflow = (WorkflowInstance)this.formService.saveForm(

58
source/java/org/alfresco/repo/forms/processor/workflow/WorkflowFormProcessor.java
View File

@@ -24,10 +24,13 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.alfresco.model.ContentModel;
import org.alfresco.repo.forms.AssociationFieldDefinition;
import org.alfresco.repo.forms.Form;
import org.alfresco.repo.forms.FormData;
import org.alfresco.repo.forms.FormNotFoundException;
import org.alfresco.repo.forms.Item;
import org.alfresco.repo.forms.AssociationFieldDefinition.Direction;
import org.alfresco.repo.forms.processor.node.ContentModelFormProcessor;
import org.alfresco.repo.workflow.WorkflowModel;
import org.alfresco.service.cmr.dictionary.AspectDefinition;
@@ -35,6 +38,7 @@ import org.alfresco.service.cmr.dictionary.AssociationDefinition;
import org.alfresco.service.cmr.dictionary.PropertyDefinition;
import org.alfresco.service.cmr.dictionary.TypeDefinition;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.cmr.workflow.WorkflowDefinition;
import org.alfresco.service.cmr.workflow.WorkflowException;
import org.alfresco.service.cmr.workflow.WorkflowInstance;
@@ -42,9 +46,11 @@ import org.alfresco.service.cmr.workflow.WorkflowPath;
import org.alfresco.service.cmr.workflow.WorkflowService;
import org.alfresco.service.cmr.workflow.WorkflowTask;
import org.alfresco.service.cmr.workflow.WorkflowTaskState;
import org.alfresco.service.namespace.NamespaceService;
import org.alfresco.service.namespace.QName;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.util.StringUtils;
/**
* Temporary FormProcessor implementation that can generate and persist
@@ -57,9 +63,13 @@ public class WorkflowFormProcessor extends ContentModelFormProcessor<WorkflowDef
/** Logger */
private static Log logger = LogFactory.getLog(WorkflowFormProcessor.class);
public static final String TRANSIENT_PACKAGE_ITEMS = "packageItems";
/** workflow service */
protected WorkflowService workflowService;
protected NodeService unprotectedNodeService;
/**
* Sets the workflow service
*
@@ -70,6 +80,11 @@ public class WorkflowFormProcessor extends ContentModelFormProcessor<WorkflowDef
this.workflowService = workflowService;
}
public void setSmallNodeService(NodeService nodeService)
{
this.unprotectedNodeService = nodeService;
}
/*
* @see
* org.alfresco.repo.forms.processor.node.ContentModelFormProcessor#getLogger
@@ -151,9 +166,35 @@ public class WorkflowFormProcessor extends ContentModelFormProcessor<WorkflowDef
generateAllAssociationFields(typeDef, form);
}
// add the "packageItems" transient field
generatePackageItemsTransientField(form);
if (logger.isDebugEnabled()) logger.debug("Generating form: " + form);
}
/**
* Generates the 'packageItems' field
*
* @param form The Form instance to populate
*/
protected void generatePackageItemsTransientField(Form form)
{
// setup basic field info
AssociationFieldDefinition fieldDef = new AssociationFieldDefinition(TRANSIENT_PACKAGE_ITEMS,
"cm:content", Direction.TARGET);
fieldDef.setLabel("Items");
fieldDef.setDescription("Items that are part of the workflow");
fieldDef.setProtectedField(false);
fieldDef.setEndpointMandatory(false);
fieldDef.setEndpointMany(true);
// define the data key name and set
fieldDef.setDataKeyName(ASSOC_DATA_PREFIX + TRANSIENT_PACKAGE_ITEMS);
// add definition to the form
form.addFieldDefinition(fieldDef);
}
/**
* Sets up the field definitions for all the type's properties.
*
@@ -230,14 +271,27 @@ public class WorkflowFormProcessor extends ContentModelFormProcessor<WorkflowDef
// TODO: iterate through form data to collect properties, for now
// just hardcode the ones we know
params.put(WorkflowModel.PROP_DESCRIPTION,
(Serializable)data.getFieldData("prop_bpm_description").getValue());
(Serializable)data.getFieldData("prop_bpm_workflowDescription").getValue());
NodeRef assignee = new NodeRef(data.getFieldData("assoc_bpm_assignee_added").getValue().toString());
ArrayList<NodeRef> assigneeList = new ArrayList<NodeRef>(1);
assigneeList.add(assignee);
params.put(WorkflowModel.ASSOC_ASSIGNEE, assigneeList);
// TODO: add any package items
// add any package items
Object items = data.getFieldData("assoc_packageItems_added").getValue();
if (items != null)
{
String[] nodeRefs = StringUtils.tokenizeToStringArray(items.toString(), ",");
for (int x = 0; x < nodeRefs.length; x++)
{
NodeRef item = new NodeRef(nodeRefs[x]);
this.unprotectedNodeService.addChild(workflowPackage, item,
WorkflowModel.ASSOC_PACKAGE_CONTAINS, QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI,
QName.createValidLocalName((String)this.nodeService.getProperty(
item, ContentModel.PROP_NAME))));
}
}
// TODO: add any context (this could re-use alf_destination)