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

PMCORE-1695 Datasource property does not work in a suggest control when it is inside a grid control.

Browse Source
This commit is contained in:
Roly Rudy Gutierrez Pinto
2021-02-03 15:55:01 -04:00
parent fb933feed9
commit ec4432734b
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -817,6 +817,15 @@ class Variable
//in the current change there is no specific property that indicates //in the current change there is no specific property that indicates
//if the control is in the grid. //if the control is in the grid.
if (isset($field->columnWidth)) { if (isset($field->columnWidth)) {
if (!empty($field->dataVariable)) {
//this support the global variable for @?, only access grids
//for access to all variables, replace with '/^\s*@.(.+)\s*$/'
$dataVariable = preg_match('/^\s*@\?(.+)\s*$/', $field->dataVariable, $arrayMatch) ? $arrayMatch[1] : $json->dataVariable;
if (isset($params[$dataVariable]) && is_array($params[$dataVariable])) {
$globalVariables[$dataVariable] = $params[$dataVariable];
$paramsAndGlobal[$dataVariable] = $params[$dataVariable];
}
}
$pmDynaform->fields["APP_DATA"] = $globalVariables; $pmDynaform->fields["APP_DATA"] = $globalVariables;
$field->queryInputData = $paramsAndGlobal; $field->queryInputData = $paramsAndGlobal;
} }