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/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 bb083a10f..ff962706c 100755 --- a/workflow/engine/xmlform/steps/steps_List.xml +++ b/workflow/engine/xmlform/steps/steps_List.xml @@ -17,6 +17,10 @@ Type + + Mode + +