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

HOR-63-A

Browse Source
This commit is contained in:
Luis Fernando Saisa Lopez
2016-07-15 14:52:57 -04:00
parent 8ca2c6488f
commit 21c4a8fa40
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

@@ -1315,6 +1315,10 @@ class Derivation
$sTargetField = trim($sTargetField, " @#%?$="); $sTargetField = trim($sTargetField, " @#%?$=");
$aNewFields[$sTargetField] = isset( $appFields['APP_DATA'][$sOriginField] ) ? $appFields['APP_DATA'][$sOriginField] : ''; $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 ); $aOldFields['APP_DATA'] = array_merge( $aOldFields['APP_DATA'], $aNewFields );
@@ -1435,8 +1439,13 @@ class Derivation
$sTargetField = str_replace('$', '', $sTargetField); $sTargetField = str_replace('$', '', $sTargetField);
$sTargetField = str_replace('=', '', $sTargetField); $sTargetField = str_replace('=', '', $sTargetField);
$aNewFields[$sTargetField] = isset($appFields['APP_DATA'][$sOriginField]) ? $appFields['APP_DATA'][$sOriginField] : ''; $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); $aParentCase['APP_DATA'] = array_merge($aParentCase['APP_DATA'], $aNewFields);