fernando/luos
1
0
Fork 0
Code Releases Activity

fix in task to task

Browse Source
This commit is contained in:
Ronald Q
2016-08-12 15:30:38 -04:00
parent 146adf1fe0
commit 2a77c913b4
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -80,12 +80,9 @@ class RoutingScreen extends \Derivation
} }
return array_combine(range(1, count($response)), array_values($response)); return array_combine(range(1, count($response)), array_values($response));
} }
public function checkElement($element) public function checkElement($element)
{ {
if (empty($element['in'])) {
return true;
}
$outElement = $element['out']; $outElement = $element['out'];
foreach ($outElement as $indexO => $outE) { foreach ($outElement as $indexO => $outE) {
if (!$this->isFirst && in_array($outE, $this->gateway)) { if (!$this->isFirst && in_array($outE, $this->gateway)) {
@@ -95,11 +92,14 @@ class RoutingScreen extends \Derivation
$this->taskSecJoin[$indexO] = $outE; $this->taskSecJoin[$indexO] = $outE;
} }
} }
if (empty($element['in'])) {
return true;
}
$this->isFirst = false; $this->isFirst = false;
$inElement = $element['in']; $inElement = $element['in'];
foreach ($inElement as $indexI => $inE) { foreach ($inElement as $indexI => $inE) {
if ($inE == 'SEC-JOIN') { if ($inE == 'SEC-JOIN' && strpos($indexI, 'itee') !== false) {
$this->convergent[$indexI]=$inE; $this->convergent[$indexI] = $inE;
} }
$this->checkElement($this->node[$indexI]); $this->checkElement($this->node[$indexI]);
} }