composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-23 10:38:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

N°2847 Handle no contact linked to user on usr menu icon hover

Browse Source
This commit is contained in:
Stephen Abello
2020-08-04 14:44:42 +02:00
parent 2db7611368
commit 18b653f641
2 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
core/userrights.class.inc.php
View File

@@ -1168,6 +1168,27 @@ class UserRights
return $sFirstname;
}
/**
* Return the friendlyname of the current user's contact.
* If the user has no contact, null is returned.
*
* @return string|null
* @throws \Exception
* @since 2.8.0
*/
public static function GetContactFriendlyname()
{
$sFriendlyname = null;
$oContact = static::GetContactObject();
if(!is_null($oContact) && MetaModel::IsValidAttCode(get_class($oContact), 'friendlyname'))
{
$sFriendlyname = $oContact->Get('friendlyname');
}
return $sFriendlyname;
}
/**
* @return \DBObject|null
*/

4
sources/application/UI/Layout/NavigationMenu/NavigationMenu.php
View File

@@ -213,6 +213,7 @@ class NavigationMenu extends UIBlock
*/
protected function ComputeUserData()
{
//Todo : what do we show if no contact is linked to the user ?
$aData = [
'sOrganization' => UserRights::GetContactOrganizationFriendlyname(),
'sFirstname' => UserRights::GetContactFirstname(),
@@ -222,7 +223,8 @@ class NavigationMenu extends UIBlock
// Logon message
$sLogonMessageDictCode = (UserRights::IsAdministrator()) ? 'UI:LoggedAsMessage+Admin' : 'UI:LoggedAsMessage';
$aData['sLogonMessage'] = Dict::Format($sLogonMessageDictCode, UserRights::GetContactObject()->Get('friendlyname'));
$aData['sLogonMessage'] = Dict::Format($sLogonMessageDictCode, UserRights::GetContactFriendlyname());
$this->aUserData = $aData;