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

fix in Script Task

Browse Source
This commit is contained in:
Ronald Q
2016-08-11 12:06:34 -04:00
parent d5f4ae04be
commit 7755e36513
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
workflow/engine/classes/class.derivation.php
View File

@@ -258,8 +258,10 @@ class Derivation
} }
//Check Task GATEWAYTOGATEWAY, END-MESSAGE-EVENT, END-EMAIL-EVENT //Check Task GATEWAYTOGATEWAY, END-MESSAGE-EVENT, END-EMAIL-EVENT
$arrayNextTaskBackup = $this->preSanity($arrayNextTask); $arrayNextTaskBackup = $arrayNextTask;
if ($this->flagSanity) {
$arrayNextTaskBackup = $this->preSanity($arrayNextTask);
}
$arrayNextTask = array(); $arrayNextTask = array();
$i = 0; $i = 0;
foreach ($arrayNextTaskBackup as $value) { foreach ($arrayNextTaskBackup as $value) {
@@ -376,7 +378,7 @@ class Derivation
if ($arrayNextTask) { if ($arrayNextTask) {
$arrayTask = array(); $arrayTask = array();
$arrayNotTask = array(); $arrayNotTask = array();
$regex = "GATEWAYTOGATEWAY|END-MESSAGE-EVENT|END-EMAIL-EVENT|SCRIPT-TASK|INTERMEDIATE-CATCH-TIMER-EVENT|INTERMEDIATE-THROW-EMAIL-EVENT"; $regex = "GATEWAYTOGATEWAY|END-MESSAGE-EVENT|END-EMAIL-EVENT|INTERMEDIATE-CATCH-TIMER-EVENT|INTERMEDIATE-THROW-EMAIL-EVENT";
foreach ($arrayNextTask as $index => $item) { foreach ($arrayNextTask as $index => $item) {
if (($item["NEXT_TASK"]["TAS_UID"] != "-1" && if (($item["NEXT_TASK"]["TAS_UID"] != "-1" &&
preg_match("/^(?:" . $regex . ")$/", $item["NEXT_TASK"]["TAS_TYPE"])) preg_match("/^(?:" . $regex . ")$/", $item["NEXT_TASK"]["TAS_TYPE"]))

2
workflow/engine/src/ProcessMaker/Core/RoutingScreen.php
View File

@@ -8,7 +8,7 @@ class RoutingScreen extends \Derivation
public function __construct() public function __construct()
{ {
parent::__construct(); parent::__construct();
$this->setRegexpTaskTypeToInclude("GATEWAYTOGATEWAY|END-MESSAGE-EVENT|END-EMAIL-EVENT|SCRIPT-TASK|INTERMEDIATE-CATCH-TIMER-EVENT|INTERMEDIATE-THROW-EMAIL-EVENT"); $this->setRegexpTaskTypeToInclude("GATEWAYTOGATEWAY|END-MESSAGE-EVENT|END-EMAIL-EVENT|INTERMEDIATE-CATCH-TIMER-EVENT|INTERMEDIATE-THROW-EMAIL-EVENT");
} }
public function mergeDataDerivation($post, $prepareInformation) public function mergeDataDerivation($post, $prepareInformation)