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

Merged in bugfix/HOR-3901 (pull request #6086)

Browse Source 
HOR-3901

Approved-by: David Callizaya <david.callizaya@processmaker.com>
This commit is contained in:
Paula Quispe
2017-10-06 11:55:42 +00:00
committed by Julio Cesar Laura Avendaño
parent 1dba1d1599 9bb07bbc2a
commit 958e1255a8
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2033,15 +2033,23 @@ class WsBase
* This function is used when the case is derived from abe, Soap, PMFDerivateCase * This function is used when the case is derived from abe, Soap, PMFDerivateCase
* *
* @param string $caseId, Uid related to the case * @param string $caseId, Uid related to the case
* @param array $appData, contain all the information about the case * @param array $appData, contain all the information about the case related to the index [APP_DATA]
* @param string $tasUid, Uid related to the task * @param string $tasUid, Uid related to the task
* @param string $stepType, before or after step * @param string $stepType, before or after step
* @param string $stepUidObj, can be -1, -2 * @param string $stepUidObj, can be -1, -2
* @param string $triggerType, can be BEFORE, AFTER * @param string $triggerType, can be BEFORE, AFTER
* @param string $labelAssigment, label related to the triggerType * @param string $labelAssignment, label related to the triggerType
*
* @return string $varTriggers updated
*/ */
public function executeTriggerFromDerivate( public function executeTriggerFromDerivate(
$caseId, $appData, $tasUid, $stepType, $stepUidObj, $triggerType, $labelAssigment = '' $caseId,
$appData,
$tasUid,
$stepType,
$stepUidObj,
$triggerType,
$labelAssignment = ''
) { ) {
$varTriggers = ""; $varTriggers = "";
$oCase = new Cases(); $oCase = new Cases();
@@ -2050,7 +2058,7 @@ class WsBase
$aTriggers = $oCase->loadTriggers($tasUid, $stepType, $stepUidObj, $triggerType); $aTriggers = $oCase->loadTriggers($tasUid, $stepType, $stepUidObj, $triggerType);
if (count($aTriggers) > 0) { if (count($aTriggers) > 0) {
$varTriggers = $varTriggers . "<br /><b>" . $labelAssigment . "</b><br />"; $varTriggers = $varTriggers . "<br /><b>" . $labelAssignment . "</b><br />";
$oPMScript = new PMScript(); $oPMScript = new PMScript();
@@ -2064,6 +2072,7 @@ class WsBase
$params->SID = $this->wsSessionId; $params->SID = $this->wsSessionId;
} }
//We can set the index APP_DATA
$appFields["APP_DATA"] = array_merge($appData, G::getSystemConstants($params)); $appFields["APP_DATA"] = array_merge($appData, G::getSystemConstants($params));
//PMScript //PMScript
@@ -2089,6 +2098,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']);
} }
} }
} }