Merged master into dashboards2

2015-04-28 09:49:05 -04:00
parent f60ed87fcd 6fdb3308af
commit 7981b7a2e9
34 changed files with 211 additions and 106 deletions
--- a/workflow/engine/src/ProcessMaker/Services/Api/Project/DynaForm.php
+++ b/workflow/engine/src/ProcessMaker/Services/Api/Project/DynaForm.php
@@ -47,6 +47,10 @@ class DynaForm extends Api
            $dynaForm->setArrayFieldNameForException(array("processUid" => "prj_uid"));

            $arrayData = $dynaForm->executeCreate($prj_uid, $request_data);
+            if (!array_key_exists('dyn_content', $request_data)) {
+                $request_data['dyn_content']="{}";
+            }
+            $arrayData = $dynaForm->update($arrayData['dyn_uid'], $request_data);

            $response = $arrayData;