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

Merged in luisfernandosl/processmaker/HOR-133-3018 (pull request #3633)

Browse Source 
HOR-133
This commit is contained in:
Julio Cesar Laura Avendaño
2016-02-01 16:15:02 -04:00
parent 38d767d218 8af71f089a
commit 65c070ccf6
2 changed files with 34 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
workflow/engine/classes/model/Process.php
View File

@@ -340,6 +340,8 @@ class Process extends BaseProcess
public function getAll ()
{
$bpmn = new \ProcessMaker\Project\Bpmn();
$oCriteria = new Criteria( 'workflow' );
$oCriteria->addSelectColumn( ProcessPeer::PRO_UID );
@@ -359,7 +361,9 @@ class Process extends BaseProcess
$processes = Array ();
$uids = array ();
while ($oDataset->next()) {
$processes[] = $oDataset->getRow();
$row = $oDataset->getRow();
$row['PRO_PROCESS_TYPE'] = ($bpmn->exists($row['PRO_UID']))? 'BPMN' : 'CLASSIC';
$processes[] = $row;
$uids[] = $processes[sizeof( $processes ) - 1]['PRO_UID'];
}
//process details will have the info about the processes