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'];