fernando/luos
1
0
Fork 0
Code Releases Activity

Merged in gproly/processmaker/HOR-2217 (pull request #5103)

Browse Source 
HOR-2217
This commit is contained in:
Paula Quispe
2016-11-10 19:17:19 +00:00
parent e2b1b09b3c b7e415a968
commit e966866648
2 changed files with 40 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
workflow/engine/src/ProcessMaker/BusinessModel/Variable.php
View File

@@ -562,7 +562,7 @@ class Variable
//Set data
\G::LoadClass('pmDynaform');
$pmDynaform = new \pmDynaform();
$field = $pmDynaform->searchField($arrayVariable["dyn_uid"], $arrayVariable["field_id"]);
$field = $pmDynaform->searchField($arrayVariable["dyn_uid"], $arrayVariable["field_id"], $processUid);
$dbConnection = "workflow";
if ($field !== null && !empty($field->dbConnection)) {
$dbConnection = $field->dbConnection;
@@ -720,7 +720,7 @@ class Variable
//Set data
\G::LoadClass('pmDynaform');
$pmDynaform = new \pmDynaform();
$field = $pmDynaform->searchField($arrayVariable["dyn_uid"], $variableName);
$field = $pmDynaform->searchField($arrayVariable["dyn_uid"], $variableName, $processUid);
//Get data
$filter = str_replace('\'', '\'\'', (isset($arrayVariable['filter']))? $arrayVariable['filter'] : '');