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

HOR-666

Browse Source 
HOR-666:conflicts
This commit is contained in:
Paula V. Quispe
2016-04-01 15:04:46 -04:00
parent 7bb281eb00
commit dc08849f70
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 $elementDestType
); );
if($elementDestUid == "-1" || count($arrayElement) == 0){ if($elementDestUid === '-1' || count($arrayElement) === 0 || $elementDestType === 'bpmnEvent'){
$arrayElement = $this->throwElementToEnd($elementOriginUid, $rouCondition); $arrayElement = $this->throwElementToEnd($elementOriginUid, $rouCondition);
} }
foreach ($arrayElement as $value) { foreach ($arrayElement as $value) {
switch ($value[1]) { switch ($value[1]) {
case "bpmnEvent": case 'bpmnEvent':
if ($arrayEventExecute[$positionEventExecute]) { if ($arrayEventExecute[$positionEventExecute]) {
$event = \BpmnEventPeer::retrieveByPK($value[0]); $event = \BpmnEventPeer::retrieveByPK($value[0]);
if (!is_null($event)) { 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 //Message-Application throw
$result = $messageApplication->create($arrayApplicationData["APP_UID"], $arrayApplicationData["PRO_UID"], $value[0], $arrayApplicationData); $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 //Email-Event throw
$result = $emailEvent->sendEmail($arrayApplicationData["APP_UID"], $arrayApplicationData["PRO_UID"], $value[0], $arrayApplicationData); $result = $emailEvent->sendEmail($arrayApplicationData["APP_UID"], $arrayApplicationData["PRO_UID"], $value[0], $arrayApplicationData);
} }
} }
} }
break; break;
case "bpmnGateway": case 'bpmnGateway':
$positionEventExecute = "AFTER"; $positionEventExecute = 'AFTER';
break; break;
} }
} }