fernando/luos
1
0
Fork 0
Code Releases Activity

HOR-3185

Browse Source
This commit is contained in:
Roly Rudy Gutierrez Pinto
2017-09-15 17:52:26 -04:00
parent d5c8707fcf
commit e2d419fca9
3 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
workflow/engine/src/ProcessMaker/BusinessModel/Cases.php
View File

@@ -1680,6 +1680,7 @@ class Cases
if (!is_null($dynaFormUid)) {
$data["APP_DATA"] = $fields['APP_DATA'];
$data["CURRENT_DYNAFORM"] = $dynaFormUid;
$pmDynaForm = new PmDynaform($data);
$arrayDynaFormData = $pmDynaForm->getDynaform();

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

@@ -5,6 +5,7 @@ use G;
use Exception;
use AdditionalTables;
use PmDynaform;
use ProcessMaker\BusinessModel\Cases;
class Variable
{
@@ -778,6 +779,7 @@ class Variable
$fields = $case->loadCase($appUid, $delIndex);
$appData = $fields["APP_DATA"];
$appData = array_merge($appData, \ProcessMaker\BusinessModel\Cases::getGlobalVariables($appData));
$paramsWithoutAppData = $params;
$params = array_merge($appData, $params);
}
@@ -795,6 +797,11 @@ class Variable
$field->queryFilter = $filter;
$field->queryStart = $start;
$field->queryLimit = $limit;
//Grids only access the global variables of 'ProcessMaker', other variables are removed.
if (isset($field->columnWidth)) {
$pmDynaform->fields["APP_DATA"] = Cases::getGlobalVariables($appData);
$field->queryInputData = $paramsWithoutAppData;
}
//Populate control data
$pmDynaform->jsonr($field);