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

I corrected the QA observations

Browse Source
This commit is contained in:
Paula Quispe
2017-03-15 15:38:34 -04:00
parent 9cda60d95e
commit 8e726f8277
1 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
workflow/engine/classes/class.case.php
View File

@@ -5791,7 +5791,7 @@ class Cases
* @param string $delIndex * @param string $delIndex
* @return Array within all user permitions all objects' types * @return Array within all user permitions all objects' types
*/ */
public function getAllObjectsFrom($proUid, $appUid, $tasUid = "", $usrUid = "", $action = "", $delIndex = 0) public function getAllObjectsFrom($proUid, $appUid, $tasUid = '', $usrUid = '', $action = '', $delIndex = 0)
{ {
$aCase = $this->loadCase($appUid); $aCase = $this->loadCase($appUid);
@@ -5829,21 +5829,26 @@ class Cases
$opType = $row['OP_OBJ_TYPE']; $opType = $row['OP_OBJ_TYPE'];
$opObjUid = $row['OP_OBJ_UID']; $opObjUid = $row['OP_OBJ_UID'];
$obCaseStatus = $row['OP_CASE_STATUS']; $obCaseStatus = $row['OP_CASE_STATUS'];
//We should verify if the user participated
//The values of OP_CASE_STATUS is [ALL, COMPLETED, DRAFT, TO_DO, PAUSED, COMPLETED]
$sw_participate = false; // must be false for default
if ($obCaseStatus != 'COMPLETED') {
if ($opParticipated == 1) {
$oCriteriax = new Criteria('workflow');
$oCriteriax->add(AppDelegationPeer::USR_UID, $usrUid);
$oCriteriax->add(AppDelegationPeer::APP_UID, $appUid);
if (AppDelegationPeer::doCount($oCriteriax) == 0) { //The values of obCaseStatus is [ALL, COMPLETED, DRAFT, TO_DO, PAUSED]
//If the user has not participated in the case //If the case is todo and we need the participate
$sw_participate = true; //but we did not participated did not validate nothing and return array empty
} $sw_participate = false; // must be false for default
if ($obCaseStatus != 'COMPLETED' && $opParticipated == 1) {
$oCriteriax = new Criteria('workflow');
$oCriteriax->add(AppDelegationPeer::USR_UID, $usrUid);
$oCriteriax->add(AppDelegationPeer::APP_UID, $appUid);
$datasetx = AppDelegationPeer::doSelectRS($oCriteriax);
$datasetx->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$datasetx->next();
$aRow = $datasetx->getRow();
if (!is_array($aRow)) {
//The user was not participated in the case and the participation is required
$sw_participate = true;
} }
} }
//If need need to check more details about the permissions
if (!$sw_participate) { if (!$sw_participate) {
switch ($opType) { switch ($opType) {
case 'ANY': case 'ANY':
@@ -6037,7 +6042,9 @@ class Cases
$userUid, $userUid,
$action, $action,
$opTaskSource, $opTaskSource,
$opUserRelation $opUserRelation,
$aCase['APP_STATUS'],
$opParticipated
); );
break; break;