From ab9622a61c72b1246dc1c5f945537434368d77af Mon Sep 17 00:00:00 2001
From: jennylee <jennylee@colosa.com>
Date: Thu, 8 Nov 2012 14:58:47 -0400
Subject: [PATCH 1/2] BUG-7274 New feature, show on the 'Task - Step list' the
 Dynaform Mode is assigned.

I modified the files 'workflow/engine/xmlform/steps/steps_List.xml' and 'workflow/engine/classes/class.processMap.php' to add a new column in the table 'Steps' showing the Mode in wich is assigned the dynaform to the Task.
---
 workflow/engine/classes/class.processMap.php | 5 +++--
 workflow/engine/xmlform/steps/steps_List.xml | 4 ++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/workflow/engine/classes/class.processMap.php b/workflow/engine/classes/class.processMap.php
index 8929d2092..9e0b12506 100755
--- a/workflow/engine/classes/class.processMap.php
+++ b/workflow/engine/classes/class.processMap.php
@@ -792,7 +792,7 @@ class processMap
             $externalSteps = $oPluginRegistry->getSteps();
 
             $aSteps = array ();
-            $aSteps[] = array ('STEP_TITLE' => 'char','STEP_UID' => 'char','STEP_TYPE_OBJ' => 'char','STEP_CONDITION' => 'char','STEP_POSITION' => 'integer'
+            $aSteps[] = array ('STEP_TITLE' => 'char','STEP_UID' => 'char','STEP_TYPE_OBJ' => 'char','STEP_MODE' => 'char','STEP_CONDITION' => 'char','STEP_POSITION' => 'integer'
             );
             $oCriteria = new Criteria( 'workflow' );
             $oCriteria->add( StepPeer::TAS_UID, $sTaskUID );
@@ -850,7 +850,8 @@ class processMap
                         }
                         break;
                 }
-                $aSteps[] = array ('STEP_TITLE' => $sTitle,'STEP_UID' => $aRow['STEP_UID'],'STEP_TYPE_OBJ' => $aRow['STEP_TYPE_OBJ'],'STEP_CONDITION' => $aRow['STEP_CONDITION'],'STEP_POSITION' => $aRow['STEP_POSITION'],'urlEdit' => $urlEdit,'linkEditValue' => $linkEditValue,'PRO_UID' => $aRow['PRO_UID']
+
+                $aSteps[] = array ('STEP_TITLE' => $sTitle,'STEP_UID' => $aRow['STEP_UID'],'STEP_TYPE_OBJ' => $aRow['STEP_TYPE_OBJ'],'STEP_MODE' => $aRow['STEP_MODE'],'STEP_CONDITION' => $aRow['STEP_CONDITION'],'STEP_POSITION' => $aRow['STEP_POSITION'],'urlEdit' => $urlEdit,'linkEditValue' => $linkEditValue,'PRO_UID' => $aRow['PRO_UID']
                 );
                 $oDataset->next();
             }
diff --git a/workflow/engine/xmlform/steps/steps_List.xml b/workflow/engine/xmlform/steps/steps_List.xml
index bb083a10f..df8bf544f 100755
--- a/workflow/engine/xmlform/steps/steps_List.xml
+++ b/workflow/engine/xmlform/steps/steps_List.xml
@@ -17,6 +17,10 @@
   <en>Type<option name="DYNAFORM">Dynaform</option><option name="INPUT_DOCUMENT">Input Document</option><option name="OUTPUT_DOCUMENT">Output Document</option><option name="EXTERNAL">External Step</option></en>
 </STEP_TYPE_OBJ>
 
+<STEP_MODE type="dropdown" colWidth="100" titleAlign="left" align="left">
+  <en>Mode<option name="VIEW">View</option><option name="EDIT">Edit</option></en>
+</STEP_MODE>
+
 <linkEditValue type="link" value="@#linkEditValue" link="javascript:@#urlEdit" colWidth="40" align="center"/>
 
 <DELETE type="link" colWidth="30" value="@G::LoadTranslation(ID_DE_ASSIGN)" link="#" onclick="stepDelete(@QSTEP_UID, @QSTEP_POSITION);return false;"><en></en></DELETE>

From 0e6938297662dda847eb66a03c00e1522ba4a844 Mon Sep 17 00:00:00 2001
From: jennylee <jennylee@colosa.com>
Date: Thu, 8 Nov 2012 15:47:41 -0400
Subject: [PATCH 2/2] BUG-7274 New feature, show on the 'Task - Step list' the
 Dynaform Mode is assigned.

I modified the files 'workflow/engine/xmlform/steps/steps_List.xml' and 'workflow/engine/classes/class.processMap.php' to add a new column in the table 'Steps' showing the Mode in wich is assigned the dynaform to the Task.
---
 workflow/engine/js/processmap/core/processmap.js | 2 +-
 workflow/engine/xmlform/steps/steps_List.xml     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/workflow/engine/js/processmap/core/processmap.js b/workflow/engine/js/processmap/core/processmap.js
index 12956ab54..2ab262c64 100755
--- a/workflow/engine/js/processmap/core/processmap.js
+++ b/workflow/engine/js/processmap/core/processmap.js
@@ -1399,7 +1399,7 @@ var processmap=function(){
             }
             panel.options={
               limit:true,
-              size:{w:670,h:450},
+              size:{w:770,h:450},
               position:{x:50,y:50,center:true},
               title: G_STRINGS.ID_PROCESSMAP_TASK_STEPS+" "+data.label.substr(0,82) + (data.label.length>=82 ? "..." : "") ,
               theme:this.options.theme,
diff --git a/workflow/engine/xmlform/steps/steps_List.xml b/workflow/engine/xmlform/steps/steps_List.xml
index df8bf544f..ff962706c 100755
--- a/workflow/engine/xmlform/steps/steps_List.xml
+++ b/workflow/engine/xmlform/steps/steps_List.xml
@@ -17,8 +17,8 @@
   <en>Type<option name="DYNAFORM">Dynaform</option><option name="INPUT_DOCUMENT">Input Document</option><option name="OUTPUT_DOCUMENT">Output Document</option><option name="EXTERNAL">External Step</option></en>
 </STEP_TYPE_OBJ>
 
-<STEP_MODE type="dropdown" colWidth="100" titleAlign="left" align="left">
-  <en>Mode<option name="VIEW">View</option><option name="EDIT">Edit</option></en>
+<STEP_MODE type="dropdown" colWidth="80" titleAlign="left" align="left">
+  <en>Mode<option name=""><![CDATA[N/A]]></option><option name="VIEW">View</option><option name="EDIT">Edit</option></en>
 </STEP_MODE>
 
 <linkEditValue type="link" value="@#linkEditValue" link="javascript:@#urlEdit" colWidth="40" align="center"/>