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

Resolve conflict

Browse Source
This commit is contained in:
Paula Quispe
2017-08-25 18:30:41 -04:00
parent 242adaf103 5240c21961
commit b1a2bf86d7
7 changed files with 745 additions and 512 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5717,13 +5717,13 @@ class Cases
*/
public function getAllObjectsFrom($proUid, $appUid, $tasUid = '', $usrUid = '', $action = '', $delIndex = 0)
{
$aCase = $this->loadCase($appUid);
$caseData = $this->loadCase($appUid);
if ($delIndex != 0) {
$appDelay = new AppDelay();
if ($appDelay->isPaused($appUid, $delIndex)) {
$aCase["APP_STATUS"] = "PAUSED";
$caseData["APP_STATUS"] = "PAUSED";
}
}
@@ -5742,8 +5742,8 @@ class Cases
);
$oObjectPermission = new ObjectPermission();
$userPermissions = $oObjectPermission->verifyObjectPermissionPerUser($usrUid, $proUid, $tasUid, $action, $aCase);
$groupPermissions = $oObjectPermission->verifyObjectPermissionPerGroup($usrUid, $proUid, $tasUid, $action, $aCase);
$userPermissions = $oObjectPermission->verifyObjectPermissionPerUser($usrUid, $proUid, $tasUid, $action, $caseData);
$groupPermissions = $oObjectPermission->verifyObjectPermissionPerGroup($usrUid, $proUid, $tasUid, $action, $caseData);
$permissions = array_merge($userPermissions, $groupPermissions);
foreach ($permissions as $row) {
@@ -5783,7 +5783,7 @@ class Cases
$appUid,
$opTaskSource,
$opObjUid,
$aCase['APP_STATUS']
$caseData['APP_STATUS']
);
//For Ouputs
$result['OUTPUT'] = $oObjectPermission->objectPermissionByOutputInput(
@@ -5792,7 +5792,7 @@ class Cases
$opTaskSource,
'OUTPUT',
$opObjUid,
$aCase['APP_STATUS']
$caseData['APP_STATUS']
);
//For Inputs
$result['INPUT'] = $oObjectPermission->objectPermissionByOutputInput(
@@ -5801,7 +5801,7 @@ class Cases
$opTaskSource,
'INPUT',
$opObjUid,
$aCase['APP_STATUS']
$caseData['APP_STATUS']
);
//For Attachment
$result['ATTACHMENT'] = $oObjectPermission->objectPermissionByOutputInput(
@@ -5810,7 +5810,7 @@ class Cases
$opTaskSource,
'ATTACHED',
$opObjUid,
$aCase['APP_STATUS']
$caseData['APP_STATUS']
);
$result['CASES_NOTES'] = 1;
@@ -5826,7 +5826,7 @@ class Cases
$action,
$opTaskSource,
$opUserRelation,
$aCase['APP_STATUS'],
$caseData['APP_STATUS'],
$opParticipated
);
break;
@@ -5835,7 +5835,7 @@ class Cases
$appUid,
$opTaskSource,
$opObjUid,
$aCase['APP_STATUS']
$caseData['APP_STATUS']
);
break;
case 'INPUT':
@@ -5845,7 +5845,7 @@ class Cases
$opTaskSource,
'INPUT',
$opObjUid,
$aCase['APP_STATUS']
$caseData['APP_STATUS']
);
break;
case 'ATTACHMENT':
@@ -5855,7 +5855,7 @@ class Cases
$opTaskSource,
'ATTACHED',
$opObjUid,
$aCase['APP_STATUS']
$caseData['APP_STATUS']
);
break;
case 'OUTPUT':
@@ -5865,7 +5865,7 @@ class Cases
$opTaskSource,
'OUTPUT',
$opObjUid,
$aCase['APP_STATUS']
$caseData['APP_STATUS']
);
break;
case 'CASES_NOTES':
@@ -5884,7 +5884,7 @@ class Cases
$action,
$opTaskSource,
$opUserRelation,
$aCase['APP_STATUS'],
$caseData['APP_STATUS'],
$opParticipated
);
break;

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

@@ -157,10 +157,11 @@ class ObjectPermission extends BaseObjectPermission
* @param string $proUid the uid of the process
* @param string $tasUid the uid of the task
* @param string $action for the object permissions VIEW, BLOCK, RESEND
* @param array $caseData for review the case status DRAFT, TODO, COMPLETED, PAUSED
*
* @return array
*/
public function verifyObjectPermissionPerUser ($usrUid, $proUid, $tasUid = '', $action = '', $caseInfo = array())
public function verifyObjectPermissionPerUser ($usrUid, $proUid, $tasUid = '', $action = '', $caseData = array())
{
$userPermissions = array();
$oCriteria = new Criteria('workflow');
@@ -188,7 +189,7 @@ class ObjectPermission extends BaseObjectPermission
$row = $rs->getRow();
if ($row["OP_CASE_STATUS"] == "ALL" || $row["OP_CASE_STATUS"] == "" || $row["OP_CASE_STATUS"] == "0" ||
$row["OP_CASE_STATUS"] == $caseInfo["APP_STATUS"]
$row["OP_CASE_STATUS"] == $caseData["APP_STATUS"]
) {
array_push($userPermissions, $row);
}
@@ -203,10 +204,11 @@ class ObjectPermission extends BaseObjectPermission
* @param string $proUid the uid of the process
* @param string $tasUid the uid of the task
* @param string $action for the object permissions VIEW, BLOCK, RESEND
* @param array $caseData for review the case status DRAFT, TODO, COMPLETED, PAUSED
*
* @return array
*/
public function verifyObjectPermissionPerGroup ($usrUid, $proUid, $tasUid = '', $action = '')
public function verifyObjectPermissionPerGroup ($usrUid, $proUid, $tasUid = '', $action = '', $caseData = array())
{
$gr = new Groups();
$records = $gr->getActiveGroupsForAnUser($usrUid);
@@ -231,7 +233,7 @@ class ObjectPermission extends BaseObjectPermission
$row = $rs->getRow();
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"] == $caseData["APP_STATUS"]
) {
array_push($groupPermissions, $row);
}