fernando/luos
1
0
Fork 0
Code Releases Activity

Merged in bugfix/HOR-2711 (pull request #5447)

Browse Source 
HOR-2711

Approved-by: Julio Cesar Laura Avendaño
This commit is contained in:
dheeyi william
2017-02-21 19:47:08 +00:00
committed by Julio Cesar Laura Avendaño
parent 68dfe52e3e bbcdd21092
commit 9871a19cc1
2 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
workflow/engine/classes/class.pmDynaform.php
View File

@@ -28,6 +28,7 @@ class pmDynaform
private $dataSources = null; private $dataSources = null;
private $databaseProviders = null; private $databaseProviders = null;
private $propertiesToExclude = array(); private $propertiesToExclude = array();
public static $prefixs = array("@@", "@#", "@%", "@?", "@$", "@=");
public function __construct($fields = array()) public function __construct($fields = array())
{ {
@@ -194,7 +195,7 @@ class pmDynaform
$fn($json, $key, $value); $fn($json, $key, $value);
} }
//set properties from trigger //set properties from trigger
$prefixs = array("@@", "@#", "@%", "@?", "@$", "@="); $prefixs = self::$prefixs;
if (is_string($value) && in_array(substr($value, 0, 2), $prefixs)) { if (is_string($value) && in_array(substr($value, 0, 2), $prefixs)) {
$triggerValue = substr($value, 2); $triggerValue = substr($value, 2);
if (isset($this->fields["APP_DATA"][$triggerValue])) { if (isset($this->fields["APP_DATA"][$triggerValue])) {

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

@@ -1698,19 +1698,29 @@ class Cases
if (isset($field['type'])) { if (isset($field['type'])) {
if ($field['type'] != 'form') { if ($field['type'] != 'form') {
if (isset($field['name']) && isset($appData[$field['name']])) { foreach ($field as &$val) {
if (is_string($val) && in_array(substr($val, 0, 2), \pmDynaform::$prefixs)) {
$val = substr($val, 2);
}
}
foreach ($appData as $key => $valueKey) {
if (in_array($key, $field, true) != false) {
$keyname = array_search($key, $field);
if (isset($field['dataType']) && $field['dataType'] != 'grid') { if (isset($field['dataType']) && $field['dataType'] != 'grid') {
$caseVariable[$field['name']] = $appData[$field['name']]; $caseVariable[$field[$keyname]] = $appData[$field[$keyname]];
if (isset($appData[$field['name'] . '_label'])) { if (isset($appData[$field[$keyname] . '_label'])) {
$caseVariable[$field['name'] . '_label'] = $appData[$field['name'] . '_label']; $caseVariable[$field[$keyname] . '_label'] = $appData[$field[$keyname] . '_label'];
} else { } else {
$caseVariable[$field['name'] . '_label'] = ''; $caseVariable[$field[$keyname] . '_label'] = '';
} }
} else { } else {
$caseVariable[$field['name']] = $appData[$field['name']]; $caseVariable[$field[$keyname]] = $appData[$field[$keyname]];
}
break;
} }
} }
} else { } else {
$caseVariableAux = $this->__getFieldsAndValuesByDynaFormAndAppData($field, $appData, $caseVariable); $caseVariableAux = $this->__getFieldsAndValuesByDynaFormAndAppData($field, $appData, $caseVariable);
$caseVariable = array_merge($caseVariable, $caseVariableAux); $caseVariable = array_merge($caseVariable, $caseVariableAux);