fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in feature/HOR-3089 (pull request #5660)

Browse Source 
HOR-3089

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
This commit is contained in:
Paula Quispe
2017-05-11 13:18:43 +00:00
committed by Julio Cesar Laura Avendaño
parent b631d9b5a1 da2d6d318a
commit 4c97a3451d
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
workflow/engine/classes/model/Users.php
View File

@@ -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;

3
workflow/engine/src/ProcessMaker/BusinessModel/Light.php
View File

@@ -569,9 +569,10 @@ class Light
$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'];