From f2c02218559b975ebe9b0e1863b2086c2e6bfc61 Mon Sep 17 00:00:00 2001
From: Gavin Cornwell <gavin.cornwell@alfresco.com>
Date: Wed, 4 Aug 2010 07:00:40 +0000
Subject: [PATCH] Added bpm:reassignable property to bpm:workflowTask with
 default value of true and added to invite task with default value of false.

Also fixed the hidden transition handling in task form processor, cancel for invite task is no longer returned and thus rendered in the UI.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@21583 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 config/alfresco/model/bpmModel.xml                   |  6 ++++++
 .../workflow/invitation-nominated-workflow-model.xml |  9 ++++++---
 .../forms/processor/workflow/TaskFormProcessor.java  | 12 ++++++++++--
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/config/alfresco/model/bpmModel.xml b/config/alfresco/model/bpmModel.xml
index 0b03cbf3d6..72d13d8eee 100644
--- a/config/alfresco/model/bpmModel.xml
+++ b/config/alfresco/model/bpmModel.xml
@@ -245,6 +245,12 @@
                     <multiple>true</multiple>
                     <default></default>
                 </property>
+                
+                <!-- Flag to determine whether the owner can reassign their task -->
+                <property name="bpm:reassignable">
+                   <type>d:boolean</type>
+                   <default>true</default>
+                </property>
             </properties>
 
             <associations>
diff --git a/config/alfresco/workflow/invitation-nominated-workflow-model.xml b/config/alfresco/workflow/invitation-nominated-workflow-model.xml
index 9b45f6f7c8..e2f320c983 100644
--- a/config/alfresco/workflow/invitation-nominated-workflow-model.xml
+++ b/config/alfresco/workflow/invitation-nominated-workflow-model.xml
@@ -45,9 +45,12 @@
       <type name="inwf:invitePendingTask">
          <parent>bpm:workflowTask</parent>
          <overrides>
-                <property name="bpm:hiddenTransitions">
-                    <default>cancel</default>
-                </property>
+            <property name="bpm:hiddenTransitions">
+                <default>cancel</default>
+            </property>
+            <property name="bpm:reassignable">
+                <default>false</default>
+            </property>
          </overrides>         
          <mandatory-aspects>
              <aspect>inwf:nominatedInvitationStats</aspect>
diff --git a/source/java/org/alfresco/repo/forms/processor/workflow/TaskFormProcessor.java b/source/java/org/alfresco/repo/forms/processor/workflow/TaskFormProcessor.java
index fa1d1e559c..e3eaf909ac 100644
--- a/source/java/org/alfresco/repo/forms/processor/workflow/TaskFormProcessor.java
+++ b/source/java/org/alfresco/repo/forms/processor/workflow/TaskFormProcessor.java
@@ -27,6 +27,7 @@ package org.alfresco.repo.forms.processor.workflow;
 
 import java.io.Serializable;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
@@ -194,9 +195,16 @@ public class TaskFormProcessor extends AbstractWorkflowFormProcessor<WorkflowTas
     private List<String> getHiddenTransitions(WorkflowTask task)
     {
         Serializable hiddenValues = task.getProperties().get(WorkflowModel.PROP_HIDDEN_TRANSITIONS);
-        if(hiddenValues!=null && hiddenValues instanceof List<?>)
+        if (hiddenValues != null)
         {
-            return (List<String>) hiddenValues;
+            if (hiddenValues instanceof List<?>)
+            {
+                return (List<String>) hiddenValues;
+            }
+            else if (hiddenValues instanceof String)
+            {
+                return Arrays.asList(((String)hiddenValues).split(","));
+            }
         }
         return Collections.emptyList();
     }