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

HOR-3185 improvement

Browse Source
This commit is contained in:
Roly Rudy Gutierrez Pinto
2017-09-20 15:42:42 -04:00
parent 50b23ff793
commit 48902febfe
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -775,11 +775,13 @@ class Variable
//Get appData and system variables
$paramsWithoutAppData = $params;
$globalVariables = [];
if ($appUid !== null) {
$case = new \Cases();
$fields = $case->loadCase($appUid, $delIndex);
$appData = $fields["APP_DATA"];
$appData = array_merge($appData, Cases::getGlobalVariables($appData));
$globalVariables = Cases::getGlobalVariables($appData);
$appData = array_merge($appData, $globalVariables);
$params = array_merge($appData, $params);
}
@@ -802,7 +804,7 @@ class Variable
//in the current change there is no specific property that indicates
//if the control is in the grid.
if (isset($field->columnWidth)) {
$pmDynaform->fields["APP_DATA"] = Cases::getGlobalVariables($appData);
$pmDynaform->fields["APP_DATA"] = $globalVariables;
$field->queryInputData = $paramsWithoutAppData;
}