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

Merged in bugfix/PMCORE-1880 (pull request #7853)

Browse Source 
PMCORE-1880

Approved-by: Julio Cesar Laura Avendaño
This commit is contained in:
Paula Quispe
2021-03-29 21:14:03 +00:00
committed by Julio Cesar Laura Avendaño
parent 804935dc34 57cda8f9d6
commit 1fbde18a22
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'];
$obCaseStatus = $row['OP_CASE_STATUS'];
//The values of obCaseStatus is [ALL, COMPLETED, DRAFT, TO_DO, PAUSED]
//If the case is todo and we need the participate
//but we did not participated did not validate nothing and return array empty
// The values of obCaseStatus is [ALL, COMPLETED, DRAFT, TO_DO, PAUSED]
// If the case is todo and we need the participate
// but we did not participated did not validate nothing and return array empty
$swParticipate = false; // must be false for default
if ($obCaseStatus != 'COMPLETED' && $opParticipated == 1) {
if ($opParticipated === 1) {
$criteria = new Criteria('workflow');
$criteria->add(AppDelegationPeer::USR_UID, $usrUid);
$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(
$_SESSION['PROCESS'],
$_SESSION['APPLICATION'],
$_SESSION['CURRENT_TASK'],
$_SESSION['TASK'],
$_SESSION['USER_LOGGED'],
$_SESSION['INDEX']
);

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

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