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

HOR-898

Browse Source 
HOR-898

HOR-898
This commit is contained in:
Paula V. Quispe
2016-04-29 17:27:26 -04:00
parent f005aaa91a
commit b1000b1ccf
1 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -726,7 +726,25 @@ class Derivation
$elementDestType $elementDestType
); );
if($elementDestUid === '-1' || count($arrayElement) === 0 || $elementDestType === 'bpmnEvent'){ //Search next is INTERMEDIATE and MESSAGECATCH
$searchMessageCatch = false;
if($elementDestType === 'bpmnEvent'){
$c = new Criteria("workflow");
$c->addSelectColumn(BpmnEventPeer::EVN_TYPE);
$c->addSelectColumn(BpmnEventPeer::EVN_MARKER);
$c->add(BpmnEventPeer::EVN_UID, $elementDestUid);
$c->add(BpmnEventPeer::PRJ_UID, $arrayApplicationData["PRO_UID"]);
$rsC = RoutePeer::doSelectRS($c);
$rsC->setFetchmode(ResultSet::FETCHMODE_ASSOC);
if($rsC->next()){
$row = $rsC->getRow();
if($row['EVN_TYPE'] === 'INTERMEDIATE' && $row['EVN_MARKER'] === 'MESSAGECATCH'){
$searchMessageCatch = true;
}
}
}
if($elementDestUid === '-1' || count($arrayElement) === 0 || $searchMessageCatch){
$arrayElement = $this->throwElementToEnd($elementOriginUid, $rouCondition); $arrayElement = $this->throwElementToEnd($elementOriginUid, $rouCondition);
} }