Merged in 3.1 (pull request #4450)

Updating branch with changes to 2016-06-23 11:35
This commit is contained in:
Julio Cesar Laura Avendaño
2016-06-23 11:17:01 -04:00
7 changed files with 315 additions and 137 deletions

View File

@@ -296,8 +296,6 @@ class Process extends BaseProcess
public function getAll ()
{
$bpmn = new \ProcessMaker\Project\Bpmn();
$oCriteria = new Criteria( 'workflow' );
$oCriteria->addSelectColumn( ProcessPeer::PRO_UID );
@@ -320,7 +318,7 @@ class Process extends BaseProcess
$uids = array ();
while ($oDataset->next()) {
$row = $oDataset->getRow();
$row['PRO_PROCESS_TYPE'] = ($bpmn->exists($row['PRO_UID']))? 'BPMN' : 'CLASSIC';
$processes[] = $row;
$uids[] = $processes[sizeof( $processes ) - 1]['PRO_UID'];
}