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

Merged in paulis/processmaker/PM-4315 (pull request #3337)

Browse Source 
PM-4315
This commit is contained in:
Julio Cesar Laura Avendaño
2015-12-09 11:58:23 -04:00
parent e4f6671248 d2852175b6
commit 01c94e54ad
3 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
workflow/engine/classes/class.case.php
View File

@@ -4492,6 +4492,7 @@ class Cases
$iIndex = $oAppDelegation->createAppDelegation(
$aFieldsDel['PRO_UID'], $aFieldsDel['APP_UID'], $aFieldsDel['TAS_UID'], $aFieldsDel['USR_UID'], $aFieldsDel['DEL_THREAD']
);
$newDelIndex = $iIndex;
$aData = array();
$aData['APP_UID'] = $aFieldsDel['APP_UID'];
$aData['DEL_INDEX'] = $iIndex;
@@ -4532,14 +4533,12 @@ class Cases
}
/*----------------------------------********---------------------------------*/
$oCriteria = new Criteria('workflow');
$oCriteria->add(ListParticipatedLastPeer::APP_UID, $aData['APP_UID']);
$oCriteria->add(ListParticipatedLastPeer::USR_UID, $sUserUID);
$oCriteria->add(ListParticipatedLastPeer::DEL_INDEX, $iDelegation);
ListParticipatedLastPeer::doDelete($oCriteria);
$participated = new ListParticipatedLast();
$participated->remove($aData['APP_UID'], $newUserUID, $iDelegation);
$aFieldsDel = array_merge($aData, $aFieldsDel);
$aFieldsDel['USR_UID'] = $newUserUID;
$aFieldsDel['DEL_INDEX'] = $newDelIndex;
$inbox = new ListInbox();
$inbox->newRow($aFieldsDel, $sUserUID);

6
workflow/engine/classes/model/ListParticipatedLast.php
View File

@@ -173,25 +173,23 @@ class ListParticipatedLast extends BaseListParticipatedLast
if(!$this->isTheOne($app_uid, $usr_uid) || $force) {
$result = ListParticipatedLastPeer::doDelete($criteria);
}
$flagDelete = true;
}
} else {
$criteria = new Criteria("workflow");
$criteria->add(ListParticipatedLastPeer::APP_UID, $app_uid);
$criteria->add(ListParticipatedLastPeer::USR_UID, $usr_uid);
$rsCriteria = ListParticipatedLastPeer::doSelectRS($criteria);
if ($rsCriteria->next()) {
$criteria2 = clone $criteria;
if(!$this->isTheOne($app_uid, $usr_uid) || $force) {
$result = ListParticipatedLastPeer::doDelete($criteria2);
}
$flagDelete = true;
}
}
}
if ($flagDelete) {
$user = new Users();