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 1.4 to HEAD

Browse Source 
svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4145 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4146 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4159 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4160 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4164 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4165 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4165 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4166 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4176 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4178 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4179 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4181 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4145 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4146 .


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4630 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2006-12-18 11:21:44 +00:00
parent 98a57a97fa
commit 549ce68112
3 changed files with 50 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1240,7 +1240,8 @@ wf_reviewer=Reviewer
wf_reviewers=Reviewers wf_reviewers=Reviewers
wf_adhoc_due_date=Due Date wf_adhoc_due_date=Due Date
wf_adhoc_priority=Priority wf_adhoc_priority=Priority
wf_adhoc_assignee=Assign To wf_adhoc_assign_to=Assign To
wf_adhoc_assignee=Assigned To
# Admin Console messages # Admin Console messages
title_admin_console=Administration Console title_admin_console=Administration Console

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

@@ -232,6 +232,17 @@
<!-- Generic workflow task --> <!-- 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"> <config evaluator="node-type" condition="bpm:startTask" replace="true">
<property-sheet> <property-sheet>
<separator name="sep1" display-label-id="general" component-generator="HeaderSeparatorGenerator" /> <separator name="sep1" display-label-id="general" component-generator="HeaderSeparatorGenerator" />
@@ -245,6 +256,17 @@
<!-- Review and Approve workflow tasks --> <!-- Review and Approve workflow tasks -->
<config evaluator="node-type" condition="wf:submitReviewTask" 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:assignee" display-label-id="wf_reviewer" />
</property-sheet>
</config>
<config evaluator="node-type" condition="wf:reviewTask" replace="true"> <config evaluator="node-type" condition="wf:reviewTask" replace="true">
<property-sheet> <property-sheet>
<separator name="sep1" display-label-id="general" component-generator="HeaderSeparatorGenerator" /> <separator name="sep1" display-label-id="general" component-generator="HeaderSeparatorGenerator" />
@@ -255,15 +277,30 @@
<show-property name="bpm:status" /> <show-property name="bpm:status" />
</property-sheet> </property-sheet>
</config> </config>
<config evaluator="node-type" condition="wf:submitReviewTask" replace="true"> <config evaluator="node-type" condition="wf:rejectedTask" replace="true">
<property-sheet> <property-sheet>
<separator name="sep1" display-label-id="general" component-generator="HeaderSeparatorGenerator" /> <separator name="sep1" display-label-id="general" component-generator="HeaderSeparatorGenerator" />
<show-property name="bpm:workflowDescription" component-generator="TextAreaGenerator" /> <show-property name="bpm:taskId" />
<show-property name="bpm:workflowPriority" display-label-id="wf_review_priority" /> <show-property name="bpm:description" component-generator="TextAreaGenerator" read-only="true"/>
<show-property name="bpm:workflowDueDate" display-label-id="wf_review_due_date" /> <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="users_and_roles" component-generator="HeaderSeparatorGenerator" /> <separator name="sep2" display-label-id="users_and_roles" component-generator="HeaderSeparatorGenerator" />
<show-association name="bpm:assignee" display-label-id="wf_reviewer" /> <show-association name="bpm:assignee" display-label-id="wf_reviewer" read-only="true" />
</property-sheet>
</config>
<config evaluator="node-type" condition="wf:approvedTask" 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="users_and_roles" component-generator="HeaderSeparatorGenerator" />
<show-association name="bpm:assignee" display-label-id="wf_reviewer" read-only="true" />
</property-sheet> </property-sheet>
</config> </config>
@@ -322,7 +359,7 @@
<show-property name="bpm:workflowDueDate" display-label-id="wf_adhoc_due_date" /> <show-property name="bpm:workflowDueDate" display-label-id="wf_adhoc_due_date" />
<show-property name="wf:notifyMe" /> <show-property name="wf:notifyMe" />
<separator name="sep2" display-label-id="user_filter_user" component-generator="HeaderSeparatorGenerator" /> <separator name="sep2" display-label-id="user_filter_user" component-generator="HeaderSeparatorGenerator" />
<show-association name="bpm:assignee" display-label-id="wf_adhoc_assignee" /> <show-association name="bpm:assignee" display-label-id="wf_adhoc_assign_to" />
</property-sheet> </property-sheet>
</config> </config>
@@ -344,6 +381,8 @@
<show-property name="bpm:description" component-generator="TextAreaGenerator" read-only="true" /> <show-property name="bpm:description" component-generator="TextAreaGenerator" read-only="true" />
<show-property name="bpm:dueDate" read-only="true" /> <show-property name="bpm:dueDate" read-only="true" />
<show-property name="bpm:priority" read-only="true" /> <show-property name="bpm:priority" read-only="true" />
<separator name="sep2" display-label-id="users_and_roles" component-generator="HeaderSeparatorGenerator" />
<show-association name="bpm:assignee" display-label-id="wf_adhoc_assignee" read-only="true" />
</property-sheet> </property-sheet>
</config> </config>

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

@@ -17,6 +17,7 @@ import org.alfresco.service.cmr.dictionary.TypeDefinition;
import org.alfresco.service.cmr.repository.AssociationRef; import org.alfresco.service.cmr.repository.AssociationRef;
import org.alfresco.service.cmr.repository.ChildAssociationRef; import org.alfresco.service.cmr.repository.ChildAssociationRef;
import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter;
import org.alfresco.service.namespace.QName; import org.alfresco.service.namespace.QName;
import org.alfresco.util.GUID; import org.alfresco.util.GUID;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
@@ -98,7 +99,7 @@ public class TransientNode extends Node
{ {
if (startValues.get(entry.getKey()) == null) if (startValues.get(entry.getKey()) == null)
{ {
startValues.put(entry.getKey(), defaultValue); startValues.put(entry.getKey(), (Serializable)DefaultTypeConverter.INSTANCE.convert(entry.getValue().getDataType(), defaultValue));
} }
} }
} }