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

Merged in paulis/processmaker/HOR-1736 (pull request #4843)

Browse Source 
HOR-1736
This commit is contained in:
Julio Cesar Laura Avendaño
2016-08-30 19:21:34 -04:00
parent c71edad34d d012f92194
commit 8c453e3ad6
5 changed files with 49 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -282,11 +282,11 @@ class ListParticipatedLast extends BaseListParticipatedLast
return (int)$total;
}
public function loadList($usr_uid, $filters = array(), $callbackRecord = null)
public function loadList($usr_uid, $filters = array(), $callbackRecord = null, $appUid = '')
{
$pmTable = new PmTable();
$criteria = $pmTable->addPMFieldsToList('sent');
$criteria->addSelectColumn(ListParticipatedLastPeer::APP_UID);
$criteria->addSelectColumn(ListParticipatedLastPeer::DEL_INDEX);
$criteria->addSelectColumn(ListParticipatedLastPeer::USR_UID);
@@ -311,6 +311,12 @@ class ListParticipatedLast extends BaseListParticipatedLast
$criteria->addSelectColumn(ListParticipatedLastPeer::DEL_PRIORITY);
$criteria->addSelectColumn(ListParticipatedLastPeer::DEL_THREAD_STATUS);
$criteria->add( ListParticipatedLastPeer::USR_UID, $usr_uid, Criteria::EQUAL );
//Check if the user was participated in a specific case
if($appUid != ''){
$criteria->add( ListParticipatedLastPeer::APP_UID, $appUid, Criteria::EQUAL );
}
self::loadFilters($criteria, $filters);
$sort = (!empty($filters['sort'])) ? $filters['sort'] : "DEL_DELEGATE_DATE";