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 V1.3 to V1.4 (Workflow changes required)

Browse Source 
svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4152 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4153 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4163 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4164 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4178 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4179 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4328 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4329 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4331 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4332 .



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4529 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2006-12-06 16:03:37 +00:00
parent f5f4a867f7
commit 5b086fc759
5 changed files with 144 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
config/alfresco/messages/webclient.properties
View File

@@ -1209,9 +1209,12 @@ in_progress=In Progress
by=by
# Workflow Definitions
wf_review_options=Review Options
wf_review_status=Review Status
wf_review_due_date=Review Due Date
wf_review_priority=Review Priority
wf_reviewer=Reviewer
wf_reviewers=Reviewers
wf_adhoc_due_date=Due Date
wf_adhoc_priority=Priority
wf_adhoc_assignee=Assign To

56
config/alfresco/web-client-config-properties.xml
View File

@@ -232,17 +232,6 @@
<!-- Generic workflow task -->
<config evaluator="node-type" condition="bpm:workflowTask" replace="true">
<property-sheet>
<separator name="sep1" display-label-id="general" component-generator="HeaderSeparatorGenerator" />
<show-property name="bpm:taskId" />
<show-property name="bpm:description" component-generator="TextAreaGenerator" read-only="true"/>
<show-property name="bpm:dueDate" read-only="true" />
<show-property name="bpm:priority" read-only="true" />
<show-property name="bpm:status" />
</property-sheet>
</config>
<config evaluator="node-type" condition="bpm:startTask" replace="true">
<property-sheet>
<separator name="sep1" display-label-id="general" component-generator="HeaderSeparatorGenerator" />
@@ -278,6 +267,51 @@
</property-sheet>
</config>
<config evaluator="node-type" condition="wf:submitParallelReviewTask" replace="true">
<property-sheet>
<separator name="sep1" display-label-id="general" component-generator="HeaderSeparatorGenerator" />
<show-property name="bpm:workflowDescription" component-generator="TextAreaGenerator" />
<show-property name="bpm:workflowPriority" display-label-id="wf_review_priority" />
<show-property name="bpm:workflowDueDate" display-label-id="wf_review_due_date" />
<separator name="sep2" display-label-id="users_and_roles" component-generator="HeaderSeparatorGenerator" />
<show-association name="bpm:assignees" display-label-id="wf_reviewers" />
<separator name="sep3" display-label-id="wf_review_options" component-generator="HeaderSeparatorGenerator" />
<show-property name="wf:requiredApprovePercent" />
</property-sheet>
</config>
<config evaluator="node-type" condition="wf:rejectedParallelTask" replace="true">
<property-sheet>
<separator name="sep1" display-label-id="general" component-generator="HeaderSeparatorGenerator" />
<show-property name="bpm:taskId" />
<show-property name="bpm:description" component-generator="TextAreaGenerator" read-only="true"/>
<show-property name="bpm:dueDate" read-only="true" />
<show-property name="bpm:priority" read-only="true" />
<show-property name="bpm:status" />
<separator name="sep2" display-label-id="wf_review_status" component-generator="HeaderSeparatorGenerator" />
<show-property name="wf:reviewerCount" read-only="true"/>
<show-property name="wf:requiredPercent" read-only="true"/>
<show-property name="wf:approveCount" read-only="true"/>
<show-property name="wf:actualPercent" read-only="true"/>
</property-sheet>
</config>
<config evaluator="node-type" condition="wf:approvedParallelTask" replace="true">
<property-sheet>
<separator name="sep1" display-label-id="general" component-generator="HeaderSeparatorGenerator" />
<show-property name="bpm:taskId" />
<show-property name="bpm:description" component-generator="TextAreaGenerator" read-only="true"/>
<show-property name="bpm:dueDate" read-only="true" />
<show-property name="bpm:priority" read-only="true" />
<show-property name="bpm:status" />
<separator name="sep2" display-label-id="wf_review_status" component-generator="HeaderSeparatorGenerator" />
<show-property name="wf:reviewerCount" read-only="true"/>
<show-property name="wf:requiredPercent" read-only="true"/>
<show-property name="wf:approveCount" read-only="true"/>
<show-property name="wf:actualPercent" read-only="true"/>
</property-sheet>
</config>
<!-- Ad hoc workflow tasks -->
<config evaluator="node-type" condition="wf:submitAdhocTask" replace="true">

65
source/java/org/alfresco/web/bean/repository/TransientNode.java
View File

@@ -2,6 +2,7 @@ package org.alfresco.web.bean.repository;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
@@ -9,6 +10,7 @@ import java.util.Map;
import org.alfresco.error.AlfrescoRuntimeException;
import org.alfresco.service.cmr.dictionary.AspectDefinition;
import org.alfresco.service.cmr.dictionary.AssociationDefinition;
import org.alfresco.service.cmr.dictionary.ClassDefinition;
import org.alfresco.service.cmr.dictionary.DictionaryService;
import org.alfresco.service.cmr.dictionary.PropertyDefinition;
import org.alfresco.service.cmr.dictionary.TypeDefinition;
@@ -60,6 +62,69 @@ public class TransientNode extends Node
initNode(data);
}
/**
* Construct a transient node for an item yet to be created in the Repository.
*
* This will apply any one-time initialisation required upon creation of the node
* e.g. assignment of default values.
*
* @param dictionaryService dictionary service
* @param typeDef The type definition this node will represent
* @param name The name of the node
* @param data The properties and associations this node will have
* @return transient node
*/
public static TransientNode createNew(DictionaryService dictionaryService, TypeDefinition typeDef, String name, Map<QName, Serializable> data)
{
// build a complete anonymous type for the start task
List<AspectDefinition> aspects = typeDef.getDefaultAspects();
List<QName> aspectNames = new ArrayList<QName>(aspects.size());
getMandatoryAspects(typeDef, aspectNames);
ClassDefinition startTaskDef = dictionaryService.getAnonymousType(typeDef.getName(), aspectNames);
// initialise start task values
Map<QName, Serializable> startValues = new HashMap<QName, Serializable>();
if (data != null)
{
startValues.putAll(data);
}
// apply default values
Map<QName, PropertyDefinition> propertyDefs = startTaskDef.getProperties();
for (Map.Entry<QName, PropertyDefinition> entry : propertyDefs.entrySet())
{
String defaultValue = entry.getValue().getDefaultValue();
if (defaultValue != null)
{
if (startValues.get(entry.getKey()) == null)
{
startValues.put(entry.getKey(), defaultValue);
}
}
}
return new TransientNode(typeDef.getName(), name, startValues);
}
/**
* Gets a flattened list of all mandatory aspects for a given class
*
* @param classDef the class
* @param aspects a list to hold the mandatory aspects
*/
private static void getMandatoryAspects(ClassDefinition classDef, List<QName> aspects)
{
for (AspectDefinition aspect : classDef.getDefaultAspects())
{
QName aspectName = aspect.getName();
if (!aspects.contains(aspectName))
{
aspects.add(aspect.getName());
getMandatoryAspects(aspect, aspects);
}
}
}
/**
* Initialises the node.
*

3
source/java/org/alfresco/web/bean/workflow/ManageTaskDialog.java
View File

@@ -253,8 +253,6 @@ public class ManageTaskDialog extends BaseDialogBean
}
}
if (selectedTransition != null)
{
UserTransaction tx = null;
try
@@ -287,7 +285,6 @@ public class ManageTaskDialog extends BaseDialogBean
Utils.addErrorMessage(formatErrorMessage(e), e);
outcome = this.getErrorOutcome(e);
}
}
return outcome;
}

2
source/java/org/alfresco/web/bean/workflow/StartWorkflowWizard.java
View File

@@ -202,7 +202,7 @@ public class StartWorkflowWizard extends BaseWizardBean
logger.debug("Start task definition: " + taskDef);
// create an instance of a task from the data dictionary
this.startTaskNode = new TransientNode(taskDef.metadata.getName(),
this.startTaskNode = TransientNode.createNew(dictionaryService, taskDef.metadata,
"task_" + System.currentTimeMillis(), null);
}