Merged in victorsl/processmaker/HOR-80-31 (pull request #4425)

HOR-80
2016-06-22 16:43:23 -04:00
parent 8d39a55e54 e3d08619d3
commit 524d139820
6 changed files with 313 additions and 128 deletions
--- a/workflow/engine/classes/model/Process.php
+++ b/workflow/engine/classes/model/Process.php
@@ -340,8 +340,6 @@ class Process extends BaseProcess

    public function getAll ()
    {
-        $bpmn = new \ProcessMaker\Project\Bpmn();
-
        $oCriteria = new Criteria( 'workflow' );

        $oCriteria->addSelectColumn( ProcessPeer::PRO_UID );
@@ -362,7 +360,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'];
        }