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

Merged in bugfix/HOR-4283 (pull request #6340)

Browse Source 
HOR-4283

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
This commit is contained in:
Paula Quispe
2018-02-02 17:49:12 +00:00
committed by Julio Cesar Laura Avendaño
parent 8eb9e37693 f8bdba678c
commit ca999fe65f
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
workflow/engine/classes/WsBase.php
View File

@@ -2045,7 +2045,7 @@ class WsBase
* @param string $labelAssigment, label related to the triggerType * @param string $labelAssigment, label related to the triggerType
*/ */
public function executeTriggerFromDerivate( public function executeTriggerFromDerivate(
$caseId, $appData, $tasUid, $stepType, $stepUidObj, $triggerType, $labelAssigment = '' $caseId, &$appData, $tasUid, $stepType, $stepUidObj, $triggerType, $labelAssigment = ''
) { ) {
$varTriggers = ""; $varTriggers = "";
$oCase = new Cases(); $oCase = new Cases();
@@ -2093,6 +2093,9 @@ class WsBase
unset($appFields['APP_PROC_CODE']); unset($appFields['APP_PROC_CODE']);
unset($appFields['APP_PIN']); unset($appFields['APP_PIN']);
$oCase->updateCase($caseId, $appFields); $oCase->updateCase($caseId, $appFields);
//We need to update the variable $appData for use the new variables in the next trigger
$appData = array_merge($appData, $appFields['APP_DATA']);
} }
} }
} }
@@ -2287,8 +2290,6 @@ class WsBase
$aData, $nextDelegations, $nextRouteType, $aCurrentDerivation $aData, $nextDelegations, $nextRouteType, $aCurrentDerivation
); );
$appFields = $oCase->loadCase($caseId);
//Execute triggers after routing //Execute triggers after routing
$varTriggers .= $this->executeTriggerFromDerivate($caseId, $appFields["APP_DATA"], $appdel['TAS_UID'], 'ASSIGN_TASK', -2, 'AFTER', "-= After Derivation =-"); $varTriggers .= $this->executeTriggerFromDerivate($caseId, $appFields["APP_DATA"], $appdel['TAS_UID'], 'ASSIGN_TASK', -2, 'AFTER', "-= After Derivation =-");