fernando/luos
1
0
Fork 0
Code Releases Activity

Merged in paulis/processmaker/PM-4385 (pull request #3344)

Browse Source 
PM-4385
This commit is contained in:
Julio Cesar Laura Avendaño
2015-12-09 11:56:12 -04:00
parent e4d9242b65 4220f9ac8d
commit e4f6671248
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -789,7 +789,7 @@ class Derivation
$continue = true; $continue = true;
$row = $rsCriFlow->getRow(); $row = $rsCriFlow->getRow();
}else{ }else{
$rsCriFlow = $bpmnFlow->getElementOriginToElementDest($row["FLO_ELEMENT_DEST"],$routeCondition); $rsCriFlow = $bpmnFlow->getElementOriginToElementDest($row["FLO_ELEMENT_DEST"],$routeCondition,"bpmnEvent");
$routeCondition = ''; $routeCondition = '';
$continue = false; $continue = false;
if($rsCriFlow->next()){ if($rsCriFlow->next()){

5
workflow/engine/classes/model/BpmnFlow.php
View File

@@ -117,7 +117,7 @@ class BpmnFlow extends BaseBpmnFlow
return $flow; return $flow;
} }
public static function getElementOriginToElementDest($floOrigin, $floCondition = ''){ public static function getElementOriginToElementDest($floOrigin, $floCondition = '', $floDestType = ''){
$criFlow = new Criteria("workflow"); $criFlow = new Criteria("workflow");
$criFlow->addSelectColumn(BpmnFlowPeer::FLO_ELEMENT_ORIGIN); $criFlow->addSelectColumn(BpmnFlowPeer::FLO_ELEMENT_ORIGIN);
$criFlow->addSelectColumn(BpmnFlowPeer::FLO_ELEMENT_ORIGIN_TYPE); $criFlow->addSelectColumn(BpmnFlowPeer::FLO_ELEMENT_ORIGIN_TYPE);
@@ -128,6 +128,9 @@ class BpmnFlow extends BaseBpmnFlow
if($floCondition != ''){ if($floCondition != ''){
$criFlow->add(BpmnFlowPeer::FLO_CONDITION, $floCondition, Criteria::EQUAL); $criFlow->add(BpmnFlowPeer::FLO_CONDITION, $floCondition, Criteria::EQUAL);
} }
if($floDestType != ''){
$criFlow->add(BpmnFlowPeer::FLO_ELEMENT_DEST_TYPE, $floDestType, Criteria::EQUAL);
}
$rsCriFlow = RoutePeer::doSelectRS($criFlow); $rsCriFlow = RoutePeer::doSelectRS($criFlow);
$rsCriFlow->setFetchmode(ResultSet::FETCHMODE_ASSOC); $rsCriFlow->setFetchmode(ResultSet::FETCHMODE_ASSOC);
return $rsCriFlow; return $rsCriFlow;