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

Merge remote-tracking branch 'origin/release/3.2.1' into bugfix/HOR-1697

Browse Source
This commit is contained in:
dheeyi william
2017-05-04 14:53:52 -04:00
parent 650d7051a7 cf68fbc1b5
commit 2ca9a424f5
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
workflow/engine/classes/model/ListCanceled.php
View File

@@ -99,6 +99,9 @@ class ListCanceled extends BaseListCanceled
$oListInbox = new ListInbox(); $oListInbox = new ListInbox();
$oListInbox->removeAll($data['APP_UID']); $oListInbox->removeAll($data['APP_UID']);
//We need to remove the cancelled case from unassigned list if the record exists
$unassigned = new ListUnassigned();
$unassigned->remove($data['APP_UID'], $data['DEL_INDEX']);
//Update - WHERE //Update - WHERE
$criteriaWhere = new Criteria("workflow"); $criteriaWhere = new Criteria("workflow");

3
workflow/engine/src/ProcessMaker/BusinessModel/Light.php
View File

@@ -78,6 +78,9 @@ class Light
$tempTreeChild['processId'] = $processInfoChild['pro_uid']; $tempTreeChild['processId'] = $processInfoChild['pro_uid'];
$tempTreeChild['taskId'] = $processInfoChild['uid']; $tempTreeChild['taskId'] = $processInfoChild['uid'];
list($tempTreeChild['offlineEnabled'], $tempTreeChild['autoRoot']) = $task->getColumnValues($processInfoChild['pro_uid'], $processInfoChild['uid'], array('TAS_OFFLINE', 'TAS_AUTO_ROOT')); list($tempTreeChild['offlineEnabled'], $tempTreeChild['autoRoot']) = $task->getColumnValues($processInfoChild['pro_uid'], $processInfoChild['uid'], array('TAS_OFFLINE', 'TAS_AUTO_ROOT'));
//Add process category
$tempTreeChild['categoryName'] = $processInfoChild['catname'];
$tempTreeChild['categoryId'] = $processInfoChild['cat'];
$forms = $task->getSteps($processInfoChild['uid']); $forms = $task->getSteps($processInfoChild['uid']);
$newForm = array(); $newForm = array();
$c = 0; $c = 0;