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

HOR-2977

Browse Source 
Errors from triggers in a process need to be stored in a different file of the error_log.
This commit is contained in:
dheeyi william
2017-05-11 09:03:45 -04:00
parent 100e69298a
commit 511614ecb7
5 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
workflow/engine/bin/cron_single.php
View File

@@ -868,6 +868,7 @@ function executeCaseSelfService()
global $oPMScript; global $oPMScript;
$oPMScript = new PMScript(); $oPMScript = new PMScript();
$oPMScript->setDataTrigger($row);
$oPMScript->setFields($appFields["APP_DATA"]); $oPMScript->setFields($appFields["APP_DATA"]);
$oPMScript->setScript($row["TRI_WEBBOT"]); $oPMScript->setScript($row["TRI_WEBBOT"]);
$oPMScript->execute(); $oPMScript->execute();

1
workflow/engine/classes/class.case.php
View File

@@ -7145,6 +7145,7 @@ class Cases
$aFields['APP_DATA']['APPLICATION'] = $appUid; $aFields['APP_DATA']['APPLICATION'] = $appUid;
$aFields['APP_DATA']['PROCESS'] = $proUid; $aFields['APP_DATA']['PROCESS'] = $proUid;
$oPMScript = new PMScript(); $oPMScript = new PMScript();
$oPMScript->setDataTrigger($arrayWebBotTrigger);
$oPMScript->setFields($aFields['APP_DATA']); $oPMScript->setFields($aFields['APP_DATA']);
$oPMScript->setScript($arrayWebBotTrigger['TRI_WEBBOT']); $oPMScript->setScript($arrayWebBotTrigger['TRI_WEBBOT']);
$oPMScript->execute(); $oPMScript->execute();

2
workflow/engine/classes/class.wsBase.php
View File

@@ -2203,6 +2203,7 @@ class wsBase
} }
if ($bExecute) { if ($bExecute) {
$oPMScript->setDataTrigger($aTrigger);
$oPMScript->setScript( $aTrigger['TRI_WEBBOT'] ); $oPMScript->setScript( $aTrigger['TRI_WEBBOT'] );
$oPMScript->execute(); $oPMScript->execute();
@@ -2610,6 +2611,7 @@ class wsBase
$aTriggers[] = $row; $aTriggers[] = $row;
$oPMScript = new PMScript(); $oPMScript = new PMScript();
$oPMScript->setDataTrigger($row);
$oPMScript->setFields( $appFields['APP_DATA'] ); $oPMScript->setFields( $appFields['APP_DATA'] );
$oPMScript->setScript( $row['TRI_WEBBOT'] ); $oPMScript->setScript( $row['TRI_WEBBOT'] );
$oPMScript->execute(); $oPMScript->execute();

1
workflow/engine/classes/model/AppEvent.php
View File

@@ -288,6 +288,7 @@ class AppEvent extends BaseAppEvent
$aFields['APP_DATA']['APP_NUMBER'] = $aFields['APP_NUMBER']; $aFields['APP_DATA']['APP_NUMBER'] = $aFields['APP_NUMBER'];
$aFields['APP_DATA']['TAS_TITLE'] = $taskFields['TAS_TITLE']; $aFields['APP_DATA']['TAS_TITLE'] = $taskFields['TAS_TITLE'];
$aFields['APP_DATA']['DEL_TASK_DUE_DATE'] = $aRow['DEL_TASK_DUE_DATE']; $aFields['APP_DATA']['DEL_TASK_DUE_DATE'] = $aRow['DEL_TASK_DUE_DATE'];
$oPMScript->setDataTrigger($oTrigger->toArray(\BasePeer::TYPE_FIELDNAME));
$oPMScript->setFields( $aFields['APP_DATA'] ); $oPMScript->setFields( $aFields['APP_DATA'] );
$oPMScript->setScript( $oTrigger->getTriWebbot() ); $oPMScript->setScript( $oTrigger->getTriWebbot() );

1
workflow/engine/src/ProcessMaker/BusinessModel/ScriptTask.php
View File

@@ -622,6 +622,7 @@ class ScriptTask
if (!is_null($trigger)) { if (!is_null($trigger)) {
$pmScript = new \PMScript(); $pmScript = new \PMScript();
$pmScript->setDataTrigger($trigger->toArray(\BasePeer::TYPE_FIELDNAME));
$pmScript->setFields($arrayApplicationData["APP_DATA"]); $pmScript->setFields($arrayApplicationData["APP_DATA"]);
$pmScript->setScript($trigger->getTriWebbot()); $pmScript->setScript($trigger->getTriWebbot());