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

Merged in bugfix/HOR-4031 (pull request #6199)

Browse Source 
HOR-4031

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
This commit is contained in:
Paula Quispe
2017-11-28 15:01:09 +00:00
committed by Julio Cesar Laura Avendaño
parent 0c22077c4d 433df5a7ec
commit a88c6e1230
1 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
workflow/engine/classes/model/ListUnassigned.php
View File

@@ -363,14 +363,17 @@ class ListUnassigned extends BaseListUnassigned implements ListInterface
}
/**
* get user's SelfService tasks
* Get user's SelfService tasks
*
* @param string $userUid
* @param boolean $adHocUsers
*
* @return array $tasks
*/
public function getSelfServiceTasks($userUid = '')
public function getSelfServiceTasks($userUid = '', $adHocUsers = false)
{
$rows[] = array();
$tasks = array();
$rows[] = [];
$tasks = [];
//check self service tasks assigned directly to this user
$c = new Criteria();
@@ -383,6 +386,10 @@ class ListUnassigned extends BaseListUnassigned implements ListInterface
$c->add(TaskPeer::TAS_ASSIGN_TYPE, 'SELF_SERVICE');
$c->add(TaskPeer::TAS_GROUP_VARIABLE, '');
$c->add(TaskUserPeer::USR_UID, $userUid);
//TU_TYPE = 2 is a AdHoc task
if (!$adHocUsers) {
$c->add(TaskUserPeer::TU_TYPE, 1);
}
$rs = TaskPeer::doSelectRS($c);
$rs->setFetchmode(ResultSet::FETCHMODE_ASSOC);
@@ -396,7 +403,7 @@ class ListUnassigned extends BaseListUnassigned implements ListInterface
}
$group = new Groups();
$aGroups = $group->getActiveGroupsForAnUser($userUid);
$groupsList = $group->getActiveGroupsForAnUser($userUid);
$c = new Criteria();
$c->clearSelectColumns();
@@ -407,7 +414,11 @@ class ListUnassigned extends BaseListUnassigned implements ListInterface
$c->add(ProcessPeer::PRO_STATUS, 'ACTIVE');
$c->add(TaskPeer::TAS_ASSIGN_TYPE, 'SELF_SERVICE');
$c->add(TaskPeer::TAS_GROUP_VARIABLE, '');
$c->add(TaskUserPeer::USR_UID, $aGroups, Criteria::IN);
$c->add(TaskUserPeer::USR_UID, $groupsList, Criteria::IN);
//TU_TYPE = 2 is a AdHoc task
if (!$adHocUsers) {
$c->add(TaskUserPeer::TU_TYPE, 1);
}
$rs = TaskPeer::doSelectRS($c);
$rs->setFetchmode(ResultSet::FETCHMODE_ASSOC);