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

Merged in gproly/processmaker/PM-3935 (pull request #3130)

Browse Source 
PM-3935
This commit is contained in:
Julio Cesar Laura Avendaño
2015-11-09 22:31:05 -04:00
parent 7f55decd03 4d80c2935e
commit 0319e8a407
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
workflow/engine/classes/class.pmDynaform.php
View File

@@ -485,6 +485,9 @@ class pmDynaform
private function getValuesDependentFields($json) private function getValuesDependentFields($json)
{ {
if (!isset($this->record["DYN_CONTENT"])) {
return array();
}
$data = array(); $data = array();
if (isset($json->dbConnection) && isset($json->sql)) { if (isset($json->dbConnection) && isset($json->sql)) {
$salida = array(); $salida = array();

2
workflow/engine/src/ProcessMaker/Services/Api/Light.php
View File

@@ -751,11 +751,11 @@ class Light extends Api
$dynaForm = new \ProcessMaker\BusinessModel\DynaForm(); $dynaForm = new \ProcessMaker\BusinessModel\DynaForm();
$dynaForm->setFormatFieldNameInUppercase(false); $dynaForm->setFormatFieldNameInUppercase(false);
\G::LoadClass("pmDynaform"); \G::LoadClass("pmDynaform");
$pmDynaForm = new \pmDynaform();
$_SESSION['PROCESS'] = $prj_uid; $_SESSION['PROCESS'] = $prj_uid;
$return = array(); $return = array();
foreach ($request_data['formId'] as $dyn_uid) { foreach ($request_data['formId'] as $dyn_uid) {
$response = $dynaForm->getDynaForm($dyn_uid); $response = $dynaForm->getDynaForm($dyn_uid);
$pmDynaForm = new \pmDynaform(array("CURRENT_DYNAFORM" => $dyn_uid));
$result = $this->parserDataDynaForm($response); $result = $this->parserDataDynaForm($response);
$result['formContent'] = (isset($result['formContent']) && $result['formContent'] != null)?json_decode($result['formContent']):""; $result['formContent'] = (isset($result['formContent']) && $result['formContent'] != null)?json_decode($result['formContent']):"";
$pmDynaForm->jsonr($result['formContent']); $pmDynaForm->jsonr($result['formContent']);