From 68d8949d4a6a722e044561c7f5156ba542664eb7 Mon Sep 17 00:00:00 2001 From: Paula Quispe Date: Tue, 28 Mar 2017 09:52:09 -0400 Subject: [PATCH 1/2] HOR-2918 --- workflow/engine/src/ProcessMaker/BusinessModel/Light.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Light.php b/workflow/engine/src/ProcessMaker/BusinessModel/Light.php index 2823a9172..d090fb27f 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/Light.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/Light.php @@ -78,6 +78,9 @@ class Light $tempTreeChild['processId'] = $processInfoChild['pro_uid']; $tempTreeChild['taskId'] = $processInfoChild['uid']; 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']); $newForm = array(); $c = 0; From 8afcecdc5a980a50f389b5fc997c17e5c7cf64fa Mon Sep 17 00:00:00 2001 From: Paula Quispe Date: Tue, 18 Apr 2017 16:24:57 -0400 Subject: [PATCH 2/2] HOR-3065 --- workflow/engine/classes/model/ListCanceled.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/workflow/engine/classes/model/ListCanceled.php b/workflow/engine/classes/model/ListCanceled.php index e9e521340..c01224f16 100644 --- a/workflow/engine/classes/model/ListCanceled.php +++ b/workflow/engine/classes/model/ListCanceled.php @@ -99,6 +99,9 @@ class ListCanceled extends BaseListCanceled $oListInbox = new ListInbox(); $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 $criteriaWhere = new Criteria("workflow");