fernando/luos
1
0
Fork 0
Code Releases Activity

Merged in paulis/processmaker/HOR-666-A (pull request #4029)

Browse Source 
HOR-666
This commit is contained in:
Julio Cesar Laura Avendaño
2016-04-01 16:25:39 -04:00
parent 0edabbb249 dc08849f70
commit 60f9890316
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -724,31 +724,31 @@ class Derivation
$elementDestType
);
if($elementDestUid == "-1" || count($arrayElement) == 0){
if($elementDestUid === '-1' || count($arrayElement) === 0 || $elementDestType === 'bpmnEvent'){
$arrayElement = $this->throwElementToEnd($elementOriginUid, $rouCondition);
}
foreach ($arrayElement as $value) {
switch ($value[1]) {
case "bpmnEvent":
case 'bpmnEvent':
if ($arrayEventExecute[$positionEventExecute]) {
$event = \BpmnEventPeer::retrieveByPK($value[0]);
if (!is_null($event)) {
if (preg_match("/^(?:END|INTERMEDIATE)$/", $event->getEvnType()) && $event->getEvnMarker() == "MESSAGETHROW") {
if (preg_match("/^(?:END|INTERMEDIATE)$/", $event->getEvnType()) && $event->getEvnMarker() === 'MESSAGETHROW') {
//Message-Application throw
$result = $messageApplication->create($arrayApplicationData["APP_UID"], $arrayApplicationData["PRO_UID"], $value[0], $arrayApplicationData);
}
if (preg_match("/^(?:END|INTERMEDIATE)$/", $event->getEvnType()) && $event->getEvnMarker() == "EMAIL") {
if (preg_match("/^(?:END|INTERMEDIATE)$/", $event->getEvnType()) && $event->getEvnMarker() === 'EMAIL') {
//Email-Event throw
$result = $emailEvent->sendEmail($arrayApplicationData["APP_UID"], $arrayApplicationData["PRO_UID"], $value[0], $arrayApplicationData);
}
}
}
break;
case "bpmnGateway":
$positionEventExecute = "AFTER";
case 'bpmnGateway':
$positionEventExecute = 'AFTER';
break;
}
}