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

Merged in paulis/processmaker/HOR-2019 (pull request #4993)

Browse Source 
HOR-2019
This commit is contained in:
Julio Cesar Laura Avendaño
2016-10-07 17:26:14 -04:00
parent d2c55c35d1 74a8f5fad3
commit 34d483b7be
3 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
workflow/engine/classes/model/ProcessUser.php
View File

@@ -93,17 +93,36 @@ class ProcessUser extends BaseProcessUser
}
}
public function validateUserAccess($proUid, $usrUid, $type)
public function validateUserAccess($proUid, $usrUid)
{
try {
$oCriteria = new Criteria();
$oCriteria->add( ProcessUserPeer::PRO_UID, $proUid );
$oCriteria->add( ProcessUserPeer::PU_TYPE, 'SUPERVISOR' );
$oCriteria->add( ProcessUserPeer::USR_UID, $usrUid );
$oCriteria->add( ProcessUserPeer::PU_TYPE, $type );
$data = ProcessUserPeer::doSelectOne( $oCriteria );
if (! is_null( $data )) {
$dataset = ProcessUserPeer::doSelectRS( $oCriteria );
$dataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
//If the user is in Assigned supervisors list
if($dataset->next()){
return true;
} else {
//If the user is in a group in Assigned supervisors list
$oCriteria = new Criteria();
$oCriteria->add( ProcessUserPeer::PRO_UID, $proUid );
$oCriteria->add( ProcessUserPeer::PU_TYPE, 'GROUP_SUPERVISOR');
$dataset = ProcessUserPeer::doSelectRS( $oCriteria );
$dataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
$oGroups = new Groups();
$aGroups = $oGroups->getActiveGroupsForAnUser($usrUid);
while ($dataset->next()) {
$row = $dataset->getRow();
$groupUid = $row['USR_UID'];
if (in_array($groupUid, $aGroups)) {
return true;
} else {
return false;
}
}
return false;
}
} catch (Exception $oError) {