From 89a4e7681ffba9ba3dbe9a34af0deceb16effc21 Mon Sep 17 00:00:00 2001 From: davidcallizaya Date: Mon, 20 Feb 2017 17:37:03 -0400 Subject: [PATCH] fixes --- workflow/engine/classes/class.wsTools.php | 2 +- workflow/engine/classes/model/ListInbox.php | 2 +- workflow/engine/classes/model/ListMyInbox.php | 4 +++- workflow/engine/classes/model/ListUnassignedGroup.php | 1 + 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/workflow/engine/classes/class.wsTools.php b/workflow/engine/classes/class.wsTools.php index 2db50e75e..bb271fe17 100644 --- a/workflow/engine/classes/class.wsTools.php +++ b/workflow/engine/classes/class.wsTools.php @@ -3627,7 +3627,7 @@ class workspaceTools . 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_UNASSIGNED_GROUP.USR_UID)'); $con->commit(); - CLI::logging("-> Populating PRO_ID, USR_ID aat LIST_* Done \n"); + CLI::logging("-> Populating PRO_ID, USR_ID at LIST_* Done \n"); } } diff --git a/workflow/engine/classes/model/ListInbox.php b/workflow/engine/classes/model/ListInbox.php index fc41a02eb..3dff55f07 100644 --- a/workflow/engine/classes/model/ListInbox.php +++ b/workflow/engine/classes/model/ListInbox.php @@ -160,7 +160,7 @@ class ListInbox extends BaseListInbox $p = new Process(); if (!empty($data['PRO_UID'])) { - $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; + $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; } $u = new Users(); if (!empty($data['USR_UID'])) { diff --git a/workflow/engine/classes/model/ListMyInbox.php b/workflow/engine/classes/model/ListMyInbox.php index fbf8a2c7a..f20ef41f5 100644 --- a/workflow/engine/classes/model/ListMyInbox.php +++ b/workflow/engine/classes/model/ListMyInbox.php @@ -65,7 +65,9 @@ class ListMyInbox extends BaseListMyInbox public function update($data) { $p = new Process(); - $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; + if(!empty($data['PRO_UID'])) { + $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; + } $u = new Users(); if(!empty($data['USR_UID'])) { $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID']; diff --git a/workflow/engine/classes/model/ListUnassignedGroup.php b/workflow/engine/classes/model/ListUnassignedGroup.php index 5bd90dda6..242f7802f 100644 --- a/workflow/engine/classes/model/ListUnassignedGroup.php +++ b/workflow/engine/classes/model/ListUnassignedGroup.php @@ -54,6 +54,7 @@ class ListUnassignedGroup extends BaseListUnassignedGroup { */ public function update($data) { + $u = new Users(); if(!empty($data['USR_UID'])) { $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID']; }