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

HOR-80

workflow/engine/classes/class.pmDynaform.php

@@ -1599,4 +1599,57 @@ class pmDynaform
         return (string) $value;
     }
 
+    /**
+     * Get grids and fields
+     *
+     * @param mixed $form
+     * @param bool  $flagGridAssocToVar
+     *
+     * @return array Return an array, FALSE otherwise
+     */
+    public static function getGridsAndFields($form, $flagGridAssocToVar = true)
+    {
+        try {
+            if (!is_object($form)) {
+                //This code it runs only in the first call to the method
+                $object = \ProcessMaker\Util\Common::stringToJson($form);
+
+                if ($object !== false) {
+                    $form = $object->items[0];
+                } else {
+                    return false;
+                }
+            }
+
+            $arrayGrid = [];
+
+            foreach ($form->items as $value) {
+                foreach ($value as $value2) {
+                    $field = $value2;
+
+                    if (isset($field->type)) {
+                        switch ($field->type) {
+                            case 'grid':
+                                $flagInsert = ($flagGridAssocToVar)? (isset($field->var_uid) && $field->var_uid != '' && isset($field->variable) && $field->variable != '') : true;
+
+                                if ($flagInsert) {
+                                    $arrayGrid[$field->id] = $field;
+                                }
+                                break;
+                            case 'form':
+                                $arrayGrid = array_merge(
+                                    $arrayGrid, $this->getGridsAndFields($field, $flagGridAssocToVar)
+                                );
+                                break;
+                        }
+                    }
+                }
+            }
+
+            //Return
+            return $arrayGrid;
+        } catch (Exception $e) {
+            throw $e;
+        }
+    }
 }

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'];
         }