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

HOR-3700 fix when a permission is related to a case status don't return rows in the process object list in case information

Browse Source
This commit is contained in:
Julio Cesar Laura Avendaño
2017-08-17 12:17:19 -04:00
parent 4bb0dba4a6
commit 6504448b1b
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
workflow/engine/classes/Cases.php
View File

@@ -5742,8 +5742,8 @@ class Cases
); );
$oObjectPermission = new ObjectPermission(); $oObjectPermission = new ObjectPermission();
$userPermissions = $oObjectPermission->verifyObjectPermissionPerUser($usrUid, $proUid, $tasUid, $action); $userPermissions = $oObjectPermission->verifyObjectPermissionPerUser($usrUid, $proUid, $tasUid, $action, $aCase);
$groupPermissions = $oObjectPermission->verifyObjectPermissionPerGroup($usrUid, $proUid, $tasUid, $action); $groupPermissions = $oObjectPermission->verifyObjectPermissionPerGroup($usrUid, $proUid, $tasUid, $action, $aCase);
$permissions = array_merge($userPermissions, $groupPermissions); $permissions = array_merge($userPermissions, $groupPermissions);
foreach ($permissions as $row) { foreach ($permissions as $row) {

4
workflow/engine/classes/model/ObjectPermission.php
View File

@@ -160,7 +160,7 @@ class ObjectPermission extends BaseObjectPermission
* *
* @return array * @return array
*/ */
public function verifyObjectPermissionPerUser ($usrUid, $proUid, $tasUid = '', $action = '') public function verifyObjectPermissionPerUser ($usrUid, $proUid, $tasUid = '', $action = '', $caseInfo = array())
{ {
$userPermissions = array(); $userPermissions = array();
$oCriteria = new Criteria('workflow'); $oCriteria = new Criteria('workflow');
@@ -188,7 +188,7 @@ class ObjectPermission extends BaseObjectPermission
$row = $rs->getRow(); $row = $rs->getRow();
if ($row["OP_CASE_STATUS"] == "ALL" || $row["OP_CASE_STATUS"] == "" || $row["OP_CASE_STATUS"] == "0" || if ($row["OP_CASE_STATUS"] == "ALL" || $row["OP_CASE_STATUS"] == "" || $row["OP_CASE_STATUS"] == "0" ||
$row["OP_CASE_STATUS"] == $aCase["APP_STATUS"] $row["OP_CASE_STATUS"] == $caseInfo["APP_STATUS"]
) { ) {
array_push($userPermissions, $row); array_push($userPermissions, $row);
} }