fernando/luos
1
0
Fork 0
Code Releases Activity

Merged in dheeyi/processmaker/HOR-982 (pull request #4407)

Browse Source 
R-982
This commit is contained in:
Julio Cesar Laura Avendaño
2016-06-22 14:06:17 -04:00
parent dafa991f2b 4491d70e63
commit 8d39a55e54
2 changed files with 57 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1358,6 +1358,7 @@ class Derivation
$appFields["APP_FINISH_DATE"] = "now"; $appFields["APP_FINISH_DATE"] = "now";
$this->verifyIsCaseChild($currentDelegation["APP_UID"], $currentDelegation["DEL_INDEX"]); $this->verifyIsCaseChild($currentDelegation["APP_UID"], $currentDelegation["DEL_INDEX"]);
$flag = true; $flag = true;
} }
if (isset( $iNewDelIndex )) { if (isset( $iNewDelIndex )) {
@@ -1525,7 +1526,17 @@ class Derivation
} }
$currentDelegation2 = array('APP_UID' => $currentDelegation['APP_UID'], 'DEL_INDEX' => $iNewDelIndex, 'APP_STATUS' => 'TO_DO', 'TAS_UID' => $currentDelegation['TAS_UID'], 'ROU_TYPE' => $aDeriveTasks[1]['ROU_TYPE'] $currentDelegation2 = array('APP_UID' => $currentDelegation['APP_UID'], 'DEL_INDEX' => $iNewDelIndex, 'APP_STATUS' => 'TO_DO', 'TAS_UID' => $currentDelegation['TAS_UID'], 'ROU_TYPE' => $aDeriveTasks[1]['ROU_TYPE']
); );
$openThreads = 0;
if ($currentDelegation2['ROU_TYPE'] == 'SEC-JOIN') {
$openThreads = $this->case->GetOpenThreads($currentDelegation['APP_UID']);
}
if ($openThreads == 0) {
$this->derivate($currentDelegation2, $nextDelegations2); $this->derivate($currentDelegation2, $nextDelegations2);
} else {
$oSubApplication = new SubApplication();
$aSubApplication['SA_STATUS'] = 'ACTIVE';
$oSubApplication->update($aSubApplication);
}
} }
} }
} }
@@ -1558,7 +1569,7 @@ class Derivation
$oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC ); $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
$oDataset->next(); $oDataset->next();
$aSP = $oDataset->getRow(); $aSP = $oDataset->getRow();
if ($aSP['SP_SYNCHRONOUS'] == 1) { if ($aSP['SP_SYNCHRONOUS'] == 1 || $aSA['SA_STATUS'] == "ACTIVE") {
$appFields = $oCase->loadCase($sApplicationUID, $delIndex); $appFields = $oCase->loadCase($sApplicationUID, $delIndex);
//Copy case variables to parent case //Copy case variables to parent case
$aFields = unserialize($aSP['SP_VARIABLES_IN']); $aFields = unserialize($aSP['SP_VARIABLES_IN']);