From e1c36895b1f72a8eed7c522c05a299d3da0f0d9f Mon Sep 17 00:00:00 2001 From: jennylee Date: Wed, 5 Dec 2012 15:14:17 -0400 Subject: [PATCH 1/2] BUG-7987 When importing a process which is created by a user that does not exist, the 'Process Owner' column shows empty. I added a validation in file 'workflow/engine/methods/processes/processes_Import_Ajax.php' to change PROCESS.PRO_CREATE_USER value in the database to the current user. --- .../methods/processes/processes_Import_Ajax.php | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/workflow/engine/methods/processes/processes_Import_Ajax.php b/workflow/engine/methods/processes/processes_Import_Ajax.php index 029581b17..6f271c846 100644 --- a/workflow/engine/methods/processes/processes_Import_Ajax.php +++ b/workflow/engine/methods/processes/processes_Import_Ajax.php @@ -155,8 +155,20 @@ if ($action == "uploadFileNewProcess") { $result->ExistGroupsInDatabase = 0; } } - //!respect of the groups + //replacing a nonexistent user for the current user + $UsrUid = $oData->process['PRO_CREATE_USER']; + + G::LoadClass( 'Users' ); + $user = new Users(); + $existUser = $user->userExists( $UsrUid ); + if ($existUser == false) + { + $UsrUid = $_SESSION['USER_LOGGED']; + $oData->process['PRO_CREATE_USER'] = $UsrUid; + } + + //!respect of the groups if ($result->ExistProcessInDatabase == 0 && $result->ExistGroupsInDatabase == 0) { if ($processFileType == "pm") { From b9cbaa695d249ad1232ac866513df82124f6ce18 Mon Sep 17 00:00:00 2001 From: jennylee Date: Wed, 5 Dec 2012 16:13:08 -0400 Subject: [PATCH 2/2] BUG-7987 When importing a process which is created by a user that does not exist, the 'Process Owner' column shows empty. I added a validation in file 'workflow/engine/methods/processes/processes_Import_Ajax.php' to change PROCESS.PRO_CREATE_USER value in the database to the current user. --- workflow/engine/methods/processes/processes_Import_Ajax.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/workflow/engine/methods/processes/processes_Import_Ajax.php b/workflow/engine/methods/processes/processes_Import_Ajax.php index 6f271c846..b32ae444a 100644 --- a/workflow/engine/methods/processes/processes_Import_Ajax.php +++ b/workflow/engine/methods/processes/processes_Import_Ajax.php @@ -161,11 +161,9 @@ if ($action == "uploadFileNewProcess") { G::LoadClass( 'Users' ); $user = new Users(); - $existUser = $user->userExists( $UsrUid ); - if ($existUser == false) + if (!$user->userExists( $UsrUid )) { - $UsrUid = $_SESSION['USER_LOGGED']; - $oData->process['PRO_CREATE_USER'] = $UsrUid; + $oData->process['PRO_CREATE_USER'] = $_SESSION['USER_LOGGED']; } //!respect of the groups