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

Merged in bugfix/PMCORE-1677 (pull request #7396)

Browse Source 
PMCORE-1677 Dependent variable needs to search the data outside the grid if the prefix is @?

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
This commit is contained in:
Roly Rudy Gutierrez Pinto
2020-06-19 19:19:15 +00:00
committed by Julio Cesar Laura Avendaño
parent 91199ad1ca d9cc26ca37
commit 6fa5ce280d
6 changed files with 801 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -765,7 +765,9 @@ class Variable
$start = isset($params["start"]) ? $params["start"] : 0;
$limit = isset($params["limit"]) ? $params["limit"] : 10;
$appUid = empty($params["app_uid"]) ? null : $params["app_uid"];
$delIndex = (int)isset($params["del_index"]) ? $params["del_index"] : 0;
$delIndex = (int) isset($params["del_index"]) ? $params["del_index"] : 0;
$gridName = isset($params['grid_name']) ? $params['grid_name'] : null;
unset($params["dyn_uid"]);
unset($params["field_id"]);
unset($params["app_uid"]);
@@ -774,6 +776,7 @@ class Variable
unset($params["query"]);
unset($params["start"]);
unset($params["limit"]);
unset($params["grid_name"]);
//Get appData and system variables
$paramsAndGlobal = $params;
@@ -798,7 +801,11 @@ class Variable
//Get control from dynaform.
//The parameters: queryFilter, queryStart, queryLimit, are only necessary
//for the suggest control, the rest of the controls are ignored.
$field = $pmDynaform->searchField($dynUid, $fieldId, $proUid);
$parameters = [$dynUid, $fieldId, $proUid];
if (!empty($gridName)) {
$parameters[] = ['gridName' => $gridName];
}
$field = $pmDynaform->searchField(...$parameters);
$field->queryField = true;
$field->queryInputData = $params;
$field->queryFilter = $filter;