From 475d0b5bf129f920ba8f18f771cc38d36d0679d0 Mon Sep 17 00:00:00 2001 From: Roly Rudy Gutierrez Pinto Date: Tue, 4 Apr 2017 15:14:15 -0400 Subject: [PATCH 1/3] HOR-2962 --- workflow/engine/classes/class.cli.php | 8 ++------ workflow/engine/classes/class.wsTools.php | 13 ------------- 2 files changed, 2 insertions(+), 19 deletions(-) diff --git a/workflow/engine/classes/class.cli.php b/workflow/engine/classes/class.cli.php index b610602b2..9d75ca6f7 100644 --- a/workflow/engine/classes/class.cli.php +++ b/workflow/engine/classes/class.cli.php @@ -290,18 +290,14 @@ EOT; $taskOpts[$validOpts[$optName]] = $optArg; } } catch (Exception $e) { - $token = strtotime("now"); - PMException::registerErrorLog($e, $token); - echo self::error( G::LoadTranslation("ID_EXCEPTION_LOG_INTERFAZ", array($token)) ); + echo self::error( "Invalid options: " . $e->getMessage() ) . "\n\n"; self::help( $taskName ); return; } try { call_user_func( $taskData['function'], $arguments, $taskOpts ); } catch (Exception $e) { - $token = strtotime("now"); - PMException::registerErrorLog($e, $token); - echo self::error( G::LoadTranslation("ID_EXCEPTION_LOG_INTERFAZ", array($token)) ); + echo self::error( "\n Error executing '$taskName':\n\n {$e->getMessage()}\n" ) . "\n"; global $tempDirectory; if (!empty($tempDirectory)) { G::rm_dir($tempDirectory); diff --git a/workflow/engine/classes/class.wsTools.php b/workflow/engine/classes/class.wsTools.php index 29d8be18d..f59bb7ca8 100644 --- a/workflow/engine/classes/class.wsTools.php +++ b/workflow/engine/classes/class.wsTools.php @@ -1701,19 +1701,6 @@ class workspaceTools if (Installer::isset_site($workspaceName)) { if ($overwrite) { - if ($workspace->dbInfo['DB_NAME'] == $workspace->dbInfo['DB_RBAC_NAME']) { - $newDatabases = 1; - } else { - $newDatabases = 3; - } - - if ($newDatabases != $oldDatabases) { - throw new Exception("We can't overwrite this workspace because it has a different amount of databases. Not only the 'source' but also the 'target' must have the same amount of databases."); - } - - if (!$workspace->workspaceExists()) { - throw new Exception('We can not overwrite this workspace because the workspace ' . $workspaceName . ' does not exist please check the lower case and upper case.'); - } CLI::logging(CLI::warning("> Workspace $workspaceName already exist, overwriting!") . "\n"); } else { throw new Exception("Destination workspace already exist (use -o to overwrite)"); From 85f8398234bd5ff097d85247c160715b3fbcab10 Mon Sep 17 00:00:00 2001 From: Roly Rudy Gutierrez Pinto Date: Thu, 20 Apr 2017 13:59:44 -0400 Subject: [PATCH 2/3] HOR-2962 --- workflow/engine/classes/class.wsTools.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/workflow/engine/classes/class.wsTools.php b/workflow/engine/classes/class.wsTools.php index f59bb7ca8..34a01bba6 100644 --- a/workflow/engine/classes/class.wsTools.php +++ b/workflow/engine/classes/class.wsTools.php @@ -1701,6 +1701,9 @@ class workspaceTools if (Installer::isset_site($workspaceName)) { if ($overwrite) { + if (!$workspace->workspaceExists()) { + throw new Exception('We can not overwrite this workspace because the workspace ' . $workspaceName . ' does not exist please check the lower case and upper case.'); + } CLI::logging(CLI::warning("> Workspace $workspaceName already exist, overwriting!") . "\n"); } else { throw new Exception("Destination workspace already exist (use -o to overwrite)"); From da2d6d318a0f982148168ca5a9343714002caf8d Mon Sep 17 00:00:00 2001 From: Paula Quispe Date: Wed, 10 May 2017 15:05:21 -0400 Subject: [PATCH 3/3] HOR-3089 --- workflow/engine/classes/model/Users.php | 10 ++++++++++ .../engine/src/ProcessMaker/BusinessModel/Light.php | 5 +++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/workflow/engine/classes/model/Users.php b/workflow/engine/classes/model/Users.php index 1be2327cc..cb6294121 100644 --- a/workflow/engine/classes/model/Users.php +++ b/workflow/engine/classes/model/Users.php @@ -195,6 +195,16 @@ class Users extends BaseUsers $translation = $translations->loadByCode($aFields['USR_DEFAULT_LANG']); $aFields['USR_DEFAULT_LANG_NAME'] = $translation['LANGUAGE_NAME']; + //Get the fullName with the correct format related to the settings + $conf = new \Configurations(); + $confEnvSetting = $conf->getFormats(); + $aFields['USR_FULLNAME'] = $conf->usersNameFormatBySetParameters( + $confEnvSetting['format'], + $aFields['USR_USERNAME'], + $aFields['USR_FIRSTNAME'], + $aFields['USR_LASTNAME'] + ); + $result = $aFields; return $result; diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Light.php b/workflow/engine/src/ProcessMaker/BusinessModel/Light.php index d090fb27f..e21c32d6e 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/Light.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/Light.php @@ -566,12 +566,13 @@ class Light $gestor = fopen($direction, "r"); $contenido = fread($gestor, filesize($direction)); fclose($gestor); - $oUser = new \Users(); + $oUser = new \Users(); $aUserLog = $oUser->loadDetailed($userUid); $response['userId'] = $aUserLog['USR_UID']; + $response['userName'] = $aUserLog['USR_USERNAME']; $response['firstName'] = $aUserLog['USR_FIRSTNAME']; $response['lastName'] = $aUserLog['USR_LASTNAME']; - $response['fullName'] = $aUserLog['USR_FIRSTNAME'].' '.$aUserLog['USR_LASTNAME']; + $response['fullName'] = $aUserLog['USR_FULLNAME']; $response['email'] = $aUserLog['USR_EMAIL']; $response['userRole'] = $aUserLog['USR_ROLE_NAME']; $response['userPhone'] = $aUserLog['USR_PHONE'];