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

Merged in bugfix/HOR-3532 (pull request #5804)

Browse Source 
HOR-3532

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
This commit is contained in:
Paula Quispe
2017-08-01 20:33:44 +00:00
committed by Julio Cesar Laura Avendaño
parent f1fb4764bd bba312c6f6
commit 083a340924
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -621,18 +621,19 @@ class ScriptTask
$trigger = \TriggersPeer::retrieveByPK($scriptTasObjUid);
if (!is_null($trigger)) {
$pmScript = new \PMScript();
$pmScript->setDataTrigger($trigger->toArray(\BasePeer::TYPE_FIELDNAME));
$pmScript->setFields($arrayApplicationData["APP_DATA"]);
$pmScript->setScript($trigger->getTriWebbot());
//Some Pmf functions uses this global variable $oPMScript for review the aFields defined
global $oPMScript;
$oPMScript = new \PMScript();
$oPMScript->setDataTrigger($trigger->toArray(\BasePeer::TYPE_FIELDNAME));
$oPMScript->setFields($arrayApplicationData["APP_DATA"]);
$oPMScript->setScript($trigger->getTriWebbot());
$oPMScript->execute();
$result = $pmScript->execute();
if (isset($pmScript->aFields["__ERROR__"])) {
\G::log("Case Uid: " . $arrayApplicationData["APP_UID"] . ", Error: " . $pmScript->aFields["__ERROR__"], PATH_DATA . "log/ScriptTask.log");
if (isset($oPMScript->aFields["__ERROR__"])) {
\G::log("Case Uid: " . $arrayApplicationData["APP_UID"] . ", Error: " . $oPMScript->aFields["__ERROR__"], PATH_DATA . "log/ScriptTask.log");
}
$arrayApplicationData["APP_DATA"] = $pmScript->aFields;
$arrayApplicationData["APP_DATA"] = $oPMScript->aFields;
$case = new \Cases();