fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #915 from Jennydmz/BUG-7274

Browse Source 
Bug 7274 New feature, show on the 'Task - Step list' the Dynaform Mode is assigned.
This commit is contained in:
julceslauhub
2012-11-08 11:59:29 -08:00
parent 771b4837ea 0e69382976
commit b3f98109aa
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
workflow/engine/classes/class.processMap.php
View File

@@ -792,7 +792,7 @@ class processMap
$externalSteps = $oPluginRegistry->getSteps(); $externalSteps = $oPluginRegistry->getSteps();
$aSteps = array (); $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 = new Criteria( 'workflow' );
$oCriteria->add( StepPeer::TAS_UID, $sTaskUID ); $oCriteria->add( StepPeer::TAS_UID, $sTaskUID );
@@ -850,7 +850,8 @@ class processMap
} }
break; 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(); $oDataset->next();
} }

2
workflow/engine/js/processmap/core/processmap.js
View File

@@ -1399,7 +1399,7 @@ var processmap=function(){
} }
panel.options={ panel.options={
limit:true, limit:true,
size:{w:670,h:450}, size:{w:770,h:450},
position:{x:50,y:50,center:true}, position:{x:50,y:50,center:true},
title: G_STRINGS.ID_PROCESSMAP_TASK_STEPS+" "+data.label.substr(0,82) + (data.label.length>=82 ? "..." : "") , title: G_STRINGS.ID_PROCESSMAP_TASK_STEPS+" "+data.label.substr(0,82) + (data.label.length>=82 ? "..." : "") ,
theme:this.options.theme, theme:this.options.theme,

4
workflow/engine/xmlform/steps/steps_List.xml
View File

@@ -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> <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_TYPE_OBJ>
<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"/> <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> <DELETE type="link" colWidth="30" value="@G::LoadTranslation(ID_DE_ASSIGN)" link="#" onclick="stepDelete(@QSTEP_UID, @QSTEP_POSITION);return false;"><en></en></DELETE>