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

restore method beforeMergeData

Browse Source
This commit is contained in:
qronald
2017-03-30 13:50:38 -04:00
parent 2a69aee63b
commit 8017e221cd
1 changed files with 31 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,8 +19,38 @@ class RoutingScreen extends \Derivation
$this->setRegexpTaskTypeToInclude("GATEWAYTOGATEWAY|END-MESSAGE-EVENT|END-EMAIL-EVENT|INTERMEDIATE-CATCH-TIMER-EVENT|INTERMEDIATE-THROW-MESSAGE-EVENT|INTERMEDIATE-THROW-EMAIL-EVENT");
}
public function mergeDataDerivation($post, $prepareInformation)
/**
* This fix only applies to classical processes when routype is SELECT
* @param $post
* @param $prepareInformation - The first index always starts at 1
* @param $rouType
* @return mixed - An array is returned whit first index 1
*/
private function beforeMergeData($post, $prepareInformation, $rouType)
{
if ($rouType == 'SELECT') {
$post = array_shift($post);
foreach ($prepareInformation as $key => $nextTask) {
if ($nextTask['ROU_CONDITION'] == $post['ROU_CONDITION'] &&
$post['SOURCE_UID'] == $nextTask['SOURCE_UID']
) {
$prepareInformationData[1] = $nextTask;
return $prepareInformationData;
}
}
}
return $prepareInformation;
}
/**
* @param $post
* @param $prepareInformation
* @param $rouType
* @return array
*/
public function mergeDataDerivation($post, $prepareInformation, $rouType)
{
$prepareInformation = $this->beforeMergeData($post, $prepareInformation, $rouType);
$aDataMerged = array();
$flagJumpTask = false;
foreach ($prepareInformation as $key => $nextTask) {