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

PMCORE-1880

Browse Source
This commit is contained in:
Paula Quispe
2021-03-29 09:34:36 -04:00
parent 9cfbd046db
commit 57cda8f9d6
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5876,11 +5876,11 @@ class Cases
$opObjUid = $row['OP_OBJ_UID']; $opObjUid = $row['OP_OBJ_UID'];
$obCaseStatus = $row['OP_CASE_STATUS']; $obCaseStatus = $row['OP_CASE_STATUS'];
//The values of obCaseStatus is [ALL, COMPLETED, DRAFT, TO_DO, PAUSED] // The values of obCaseStatus is [ALL, COMPLETED, DRAFT, TO_DO, PAUSED]
//If the case is todo and we need the participate // If the case is todo and we need the participate
//but we did not participated did not validate nothing and return array empty // but we did not participated did not validate nothing and return array empty
$swParticipate = false; // must be false for default $swParticipate = false; // must be false for default
if ($obCaseStatus != 'COMPLETED' && $opParticipated == 1) { if ($opParticipated === 1) {
$criteria = new Criteria('workflow'); $criteria = new Criteria('workflow');
$criteria->add(AppDelegationPeer::USR_UID, $usrUid); $criteria->add(AppDelegationPeer::USR_UID, $usrUid);
$criteria->add(AppDelegationPeer::APP_UID, $appUid); $criteria->add(AppDelegationPeer::APP_UID, $appUid);

2
workflow/engine/methods/cases/casesHistoryDynaformPage_Ajax.php
View File

@@ -48,7 +48,7 @@ if ($actionAjax == 'historyDynaformGrid_Ajax') {
$c = $oCase->getallDynaformsCriteria( $c = $oCase->getallDynaformsCriteria(
$_SESSION['PROCESS'], $_SESSION['PROCESS'],
$_SESSION['APPLICATION'], $_SESSION['APPLICATION'],
$_SESSION['CURRENT_TASK'], $_SESSION['TASK'],
$_SESSION['USER_LOGGED'], $_SESSION['USER_LOGGED'],
$_SESSION['INDEX'] $_SESSION['INDEX']
); );

2
workflow/engine/src/ProcessMaker/BusinessModel/Cases.php
View File

@@ -4275,7 +4275,7 @@ class Cases
$query->where('APPLICATION.APP_UID', '=', $appUid); $query->where('APPLICATION.APP_UID', '=', $appUid);
// Filter by source task // Filter by source task
if ($caseStatus != 'COMPLETED' && $sourceTask != '' && (int)$sourceTask != 0) { if (!empty($sourceTask) && (int)$sourceTask != 0) {
$query->where('STEP.TAS_UID', '=', $sourceTask); $query->where('STEP.TAS_UID', '=', $sourceTask);
} }