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

Merged in bugfix/HOR-4818 (pull request #6596)

Browse Source 
HOR-4818

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
This commit is contained in:
Paula Quispe
2018-08-20 17:08:51 +00:00
committed by Julio Cesar Laura Avendaño
parent dab42d5af8 4a98203e38
commit 88f050d8e6
1 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
workflow/engine/src/ProcessMaker/Services/Api/Cases.php
View File

@@ -7,6 +7,7 @@ use AppDelegation;
use AppDelegationPeer; use AppDelegationPeer;
use Criteria; use Criteria;
use Exception; use Exception;
use ListUnassigned;
use Luracast\Restler\RestException; use Luracast\Restler\RestException;
use ProcessMaker\BusinessModel\Cases as BmCases; use ProcessMaker\BusinessModel\Cases as BmCases;
use ProcessMaker\BusinessModel\User as BmUser; use ProcessMaker\BusinessModel\User as BmUser;
@@ -118,15 +119,14 @@ class Cases extends Api
return $user->userCanReassign($usrUid, $arrayApplicationData['PRO_UID']); return $user->userCanReassign($usrUid, $arrayApplicationData['PRO_UID']);
break; break;
case "doGetCaseInfo" : case 'doGetCaseInfo':
$appUid = $this->parameters[$arrayArgs['app_uid']]; $appUid = $this->parameters[$arrayArgs['app_uid']];
$usrUid = $this->getUserId(); $usrUid = $this->getUserId();
//Check if the user is supervisor process
$case = new BmCases(); $case = new BmCases();
$user = new BmUser();
$arrayApplicationData = $case->getApplicationRecordByPk($appUid, [], false); $arrayApplicationData = $case->getApplicationRecordByPk($appUid, [], false);
if (!empty($arrayApplicationData)) { if (!empty($arrayApplicationData)) {
$criteria = new Criteria("workflow"); $criteria = new Criteria('workflow');
$criteria->addSelectColumn(AppDelegationPeer::APP_UID); $criteria->addSelectColumn(AppDelegationPeer::APP_UID);
$criteria->add(AppDelegationPeer::APP_UID, $appUid); $criteria->add(AppDelegationPeer::APP_UID, $appUid);
$criteria->add(AppDelegationPeer::USR_UID, $usrUid); $criteria->add(AppDelegationPeer::USR_UID, $usrUid);
@@ -134,11 +134,26 @@ class Cases extends Api
$rsCriteria = AppDelegationPeer::doSelectRS($criteria); $rsCriteria = AppDelegationPeer::doSelectRS($criteria);
if ($rsCriteria->next()) { if ($rsCriteria->next()) {
return true; return true;
} else {
$supervisor = new BmProcessSupervisor();
$flagps = $supervisor->isUserProcessSupervisor($arrayApplicationData['PRO_UID'], $usrUid);
return $flagps;
} }
//verify unassigned
$list = new ListUnassigned();
$data = $list->loadList($usrUid, ['search' => $appUid, 'caseLink' => true, 'limit' => 1]);
if ($data) {
return true;
}
//Check if the user is a process supervisor or has summary form view permission
$userCanAccess = $case->userAuthorization(
$usrUid,
$arrayApplicationData['PRO_UID'],
$appUid,
[],
['SUMMARY_FORM' => 'VIEW']
);
return $userCanAccess['supervisor'] || $userCanAccess['objectPermissions']['SUMMARY_FORM'];
} }
break; break;
case 'doDownloadInputDocument': case 'doDownloadInputDocument':