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

Merged in dheeyi/processmaker/HOR-1448 (pull request #4659)

Browse Source 
HOR-1448
This commit is contained in:
Julio Cesar Laura Avendaño
2016-08-02 13:00:31 -04:00
parent 84344e77b9 e82fb4718c
commit ce59d57fe1
15 changed files with 62 additions and 834 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1138,18 +1138,6 @@ class Cases
$this->appSolr->deleteApplicationSearchIndex($sAppUid);
}
/*----------------------------------********---------------------------------*/
$criteria = new Criteria();
$criteria->addSelectColumn( ListInboxPeer::USR_UID );
$criteria->add( ListInboxPeer::APP_UID, $sAppUid, Criteria::EQUAL );
$dataset = ApplicationPeer::doSelectRS($criteria);
$dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
while($dataset->next()) {
$aRow = $dataset->getRow();
$users = new Users();
$users->refreshTotal($aRow['USR_UID'], 'remove', 'draft');
$users->refreshTotal($aRow['USR_UID'], 'remove', 'participated');
}
$oCriteria = new Criteria('workflow');
$oCriteria->add(ListInboxPeer::APP_UID, $sAppUid);
ListInboxPeer::doDelete($oCriteria);
@@ -1959,7 +1947,6 @@ class Cases
public function CloseCurrentDelegation($sAppUid, $iDelIndex)
{
try {
$oApplication = ApplicationPeer::retrieveByPk($sAppUid);
$c = new Criteria();
$c->add(AppDelegationPeer::APP_UID, $sAppUid);
$c->add(AppDelegationPeer::DEL_INDEX, $iDelIndex);
@@ -1978,22 +1965,6 @@ class Cases
}
throw (new PropelException('The row cannot be created!', new PropelException($msg)));
}
$taskNext = TaskPeer::retrieveByPK($appDel->getTasUid());
if($taskNext->getTasType() !== 'SUBPROCESS'){
if($oApplication->getAppStatus() === 'DRAFT'){
$sUserUid = $appDel->getUsrUid();
/*----------------------------------********---------------------------------*/
$users = new Users();
$users->refreshTotal($sUserUid, "remove", "draft");
/*----------------------------------********---------------------------------*/
}else{
$sUserUid = $appDel->getUsrUid();
/*----------------------------------********---------------------------------*/
$users = new Users();
$users->refreshTotal($sUserUid, "remove", "inbox");
/*----------------------------------********---------------------------------*/
}
}
}
/*----------------------------------********---------------------------------*/
$inbox = new ListInbox();