fernando/luos
1
0
Fork 0
Code Releases Activity

Merged in luisfernandosl/processmaker/HOR-63-A-31 (pull request #4574)

Browse Source 
HOR-63-A
This commit is contained in:
Julio Cesar Laura Avendaño
2016-07-19 08:39:56 -04:00
parent 6b5d9e9acb 21c4a8fa40
commit 37ffb62412
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
workflow/engine/classes/class.derivation.php
View File

@@ -1311,6 +1311,10 @@ class Derivation
$sTargetField = trim($sTargetField, " @#%?$=");
$aNewFields[$sTargetField] = isset( $appFields['APP_DATA'][$sOriginField] ) ? $appFields['APP_DATA'][$sOriginField] : '';
if (array_key_exists($sOriginField . '_label', $appFields['APP_DATA'])) {
$aNewFields[$sTargetField . '_label'] = $appFields['APP_DATA'][$sOriginField . '_label'];
}
}
$aOldFields['APP_DATA'] = array_merge( $aOldFields['APP_DATA'], $aNewFields );
@@ -1431,8 +1435,13 @@ class Derivation
$sTargetField = str_replace('$', '', $sTargetField);
$sTargetField = str_replace('=', '', $sTargetField);
$aNewFields[$sTargetField] = isset($appFields['APP_DATA'][$sOriginField]) ? $appFields['APP_DATA'][$sOriginField] : '';
if (isset($aParentCase['APP_DATA'][$sTargetField . '_label'])) {
$aNewFields[$sTargetField . '_label'] = isset($appFields['APP_DATA'][$sOriginField . '_label']) ? $appFields['APP_DATA'][$sOriginField . '_label'] : '';
if (array_key_exists($sOriginField . '_label', $appFields['APP_DATA'])) {
$aNewFields[$sTargetField . '_label'] = $appFields['APP_DATA'][$sOriginField . '_label'];
} else {
if (array_key_exists($sTargetField . '_label', $aParentCase['APP_DATA'])) {
$aNewFields[$sTargetField . '_label'] = '';
}
}
}
$aParentCase['APP_DATA'] = array_merge($aParentCase['APP_DATA'], $aNewFields);