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

Merged in paulis/processmaker/HOR-1502 (pull request #4651)

Browse Source 
HOR-1502
This commit is contained in:
Julio Cesar Laura Avendaño
2016-08-01 11:08:20 -04:00
parent a236debdb0 11d972b391
commit 9449548b4b
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
workflow/engine/classes/model/AppEvent.php
View File

@@ -146,9 +146,13 @@ class AppEvent extends BaseAppEvent
$aConditions[] = array (AppEventPeer::DEL_INDEX,AppDelegationPeer::DEL_INDEX $aConditions[] = array (AppEventPeer::DEL_INDEX,AppDelegationPeer::DEL_INDEX
); );
$oCriteria->addJoinMC( $aConditions, Criteria::LEFT_JOIN ); $oCriteria->addJoinMC( $aConditions, Criteria::LEFT_JOIN );
$oCriteria->addJoin(AppDelegationPeer::TAS_UID, TaskPeer::TAS_UID, Criteria::LEFT_JOIN); $aConditions = array ();
$aConditions[] = array (AppDelegationPeer::TAS_UID,TaskPeer::TAS_UID);
$oCriteria->addJoinMC( $aConditions, Criteria::LEFT_JOIN );
$oCriteria->addJoin(AppEventPeer::APP_UID, ApplicationPeer::APP_UID, Criteria::LEFT_JOIN); $oCriteria->addJoin(AppEventPeer::APP_UID, ApplicationPeer::APP_UID, Criteria::LEFT_JOIN);
$oCriteria->addJoin(AppDelegationPeer::PRO_UID, ProcessPeer::PRO_UID, Criteria::LEFT_JOIN); $aConditions = array ();
$aConditions[] = array (AppDelegationPeer::PRO_UID,ProcessPeer::PRO_UID);
$oCriteria->addJoinMC( $aConditions, Criteria::LEFT_JOIN );
$oCriteria->add( AppEventPeer::EVN_UID, '', Criteria::NOT_EQUAL ); $oCriteria->add( AppEventPeer::EVN_UID, '', Criteria::NOT_EQUAL );
if ($sProcessUid != '') { if ($sProcessUid != '') {
$oCriteria->add( EventPeer::PRO_UID, $sProcessUid ); $oCriteria->add( EventPeer::PRO_UID, $sProcessUid );

8
workflow/engine/methods/cases/cases_Derivate.php
View File

@@ -123,7 +123,13 @@ try {
$aCurrentDerivation = array ('APP_UID' => $_SESSION['APPLICATION'],'DEL_INDEX' => $_SESSION['INDEX'],'APP_STATUS' => $sStatus,'TAS_UID' => $_SESSION['TASK'],'ROU_TYPE' => $_POST['form']['ROU_TYPE'] $aCurrentDerivation = array ('APP_UID' => $_SESSION['APPLICATION'],'DEL_INDEX' => $_SESSION['INDEX'],'APP_STATUS' => $sStatus,'TAS_UID' => $_SESSION['TASK'],'ROU_TYPE' => $_POST['form']['ROU_TYPE']
); );
$arrayDerivationResult = $oDerivation->derivate($aCurrentDerivation, $_POST['form']['TASKS']); $aPInformation = $oDerivation->prepareInformation( array ('USER_UID' => $_SESSION['USER_LOGGED'],'APP_UID' => $_SESSION['APPLICATION'],'DEL_INDEX' => $_SESSION['INDEX']
) );
//$_POST['form']['TASKS'] is the information after the cases_ScreenDerivation
$nextTasks = G::array_merges($aPInformation,$_POST['form']['TASKS']);
$arrayDerivationResult = $oDerivation->derivate($aCurrentDerivation, $nextTasks);
if (!empty($arrayDerivationResult)) { if (!empty($arrayDerivationResult)) {
foreach ($_POST['form']['TASKS'] as $key => $value) { foreach ($_POST['form']['TASKS'] as $key => $value) {