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

Merged in bugfix/PMC-65 (pull request #6700)

Browse Source 
PMC-65

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
This commit is contained in:
Paula Quispe
2018-11-29 15:15:43 +00:00
committed by Julio Cesar Laura Avendaño
parent 8c3d9d6f87 56df0e3dd9
commit 559077f436
1 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
workflow/engine/classes/Cases.php
View File

@@ -3545,10 +3545,12 @@ class Cases
if ($oPMScript->executedOn() === $oPMScript::AFTER_ROUTING) { if ($oPMScript->executedOn() === $oPMScript::AFTER_ROUTING) {
$appUid = !empty($fieldsCase['APPLICATION']) ? $fieldsCase['APPLICATION'] : ''; $appUid = !empty($fieldsCase['APPLICATION']) ? $fieldsCase['APPLICATION'] : '';
if (!empty($appUid)) { if (!empty($appUid)) {
$lastAppFields = $this->loadCase($appUid)['APP_DATA']; //Update $fieldsCase with the last appData
$fieldsTrigger = array_merge($lastAppFields, $fieldsTrigger); $fieldsCase = $this->loadCase($appUid)['APP_DATA'];
} }
} }
//Merge the current appData with variables changed
$fieldsCase = array_merge($fieldsCase, $fieldsTrigger);
//Register the time execution //Register the time execution
$this->arrayTriggerExecutionTime[$trigger['TRI_UID']] = $oPMScript->scriptExecutionTime; $this->arrayTriggerExecutionTime[$trigger['TRI_UID']] = $oPMScript->scriptExecutionTime;
@@ -3567,16 +3569,9 @@ class Cases
); );
} }
/*----------------------------------********---------------------------------*/ /*----------------------------------********---------------------------------*/
//The Code Scanner can be interrupt the execution
if (empty($fieldsTrigger)) {
return $fieldsCase;
}
return $fieldsTrigger;
} else {
return $fieldsCase;
} }
return $fieldsCase;
} }
/** /**