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

Merged in bugfix/HOR-2810 (pull request #5487)

Browse Source 
HOR-2810

Approved-by: Julio Cesar Laura Avendaño
Approved-by: Paula Quispe
This commit is contained in:
Paula Quispe
2017-03-06 20:32:55 +00:00
committed by Julio Cesar Laura Avendaño
parent 5fbe44715e bc8453fcd3
commit 599149b66d
3 changed files with 37 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
workflow/engine/classes/model/AppDelay.php
View File

@@ -111,7 +111,6 @@ class AppDelay extends BaseAppDelay
} else { } else {
return false; return false;
} }
} }
} }

4
workflow/engine/methods/cases/open.php
View File

@@ -90,6 +90,10 @@ foreach ($_GET as $k => $v) {
} }
if( isset($_GET['action']) && ($_GET['action'] == 'jump') ) { if( isset($_GET['action']) && ($_GET['action'] == 'jump') ) {
$oNewCase = new \ProcessMaker\BusinessModel\Cases();
//We need to get the last index OPEN or CLOSED (by Paused cases)
//Set true because we need to check if the case is paused
$delIndex = $oNewCase->getOneLastThread($appUid, true);
$case = $oCase->loadCase( $appUid, $delIndex, $_GET['action']); $case = $oCase->loadCase( $appUid, $delIndex, $_GET['action']);
} else { } else {
$case = $oCase->loadCase( $appUid, $delIndex ); $case = $oCase->loadCase( $appUid, $delIndex );

33
workflow/engine/src/ProcessMaker/BusinessModel/Cases.php
View File

@@ -3338,4 +3338,37 @@ class Cases
$row = $dataSet->getRow(); $row = $dataSet->getRow();
return isset($row['DEL_INDEX']) ? $row['DEL_INDEX'] : 0; return isset($row['DEL_INDEX']) ? $row['DEL_INDEX'] : 0;
} }
/**
* Get last index, we can considering the pause thread
*
* This function return the last index thread and will be considered the paused cases
* Is created by Jump to and redirect the correct thread
* by default is not considered the paused thread
* in parallel cases return the first thread to find
* @param string $appUid
* @param boolean $checkCaseIsPaused
* @return integer delIndex
*/
public function getOneLastThread($appUid, $checkCaseIsPaused = false)
{
$criteria = new \Criteria('workflow');
$criteria->addSelectColumn(\AppDelegationPeer::DEL_INDEX);
$criteria->addSelectColumn(\AppDelegationPeer::DEL_THREAD_STATUS);
$criteria->add(\AppDelegationPeer::APP_UID, $appUid, \Criteria::EQUAL);
$dataSet = \AppDelegationPeer::doSelectRS($criteria);
$dataSet->setFetchmode(\ResultSet::FETCHMODE_ASSOC);
$dataSet->next();
$row = $dataSet->getRow();
$delIndex = 0;
while (is_array($row)) {
$delIndex = $row['DEL_INDEX'];
if ($checkCaseIsPaused && \AppDelay::isPaused($appUid, $delIndex)) {
return $delIndex;
}
$dataSet->next();
$row = $dataSet->getRow();
}
return $delIndex;
}
} }