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

N°2750 - Regression: Fix default user profile image not shown in portal due to N°2060

Browse Source
This commit is contained in:
Molkobain
2020-02-06 10:06:18 +01:00
parent f3576cffb0
commit e96a8387a0
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
datamodels/2.x/itop-portal-base/portal/config/services.yaml
View File

@@ -49,6 +49,7 @@ services:
$bDebug: '%kernel.debug%' $bDebug: '%kernel.debug%'
$sPortalCachePath: '%kernel.cache_dir%/' $sPortalCachePath: '%kernel.cache_dir%/'
$sPortalId: '%env(string:PORTAL_ID)%' $sPortalId: '%env(string:PORTAL_ID)%'
$sCombodoPortalBaseAbsoluteUrl: '%env(string:COMBODO_PORTAL_BASE_ABSOLUTE_URL)%'
$aCombodoPortalInstanceConf: '%combodo.portal.instance.conf%' $aCombodoPortalInstanceConf: '%combodo.portal.instance.conf%'
$sCombodoPortalInstanceAbsoluteUrl: '%env(string:COMBODO_PORTAL_INSTANCE_ABSOLUTE_URL)%' $sCombodoPortalInstanceAbsoluteUrl: '%env(string:COMBODO_PORTAL_INSTANCE_ABSOLUTE_URL)%'

12
datamodels/2.x/itop-portal-base/portal/src/VariableAccessor/CombodoCurrentContactPhotoUrl.php
View File

@@ -37,8 +37,8 @@ class CombodoCurrentContactPhotoUrl
{ {
/** @var \User $oUser */ /** @var \User $oUser */
private $oUser; private $oUser;
/** @var string $sCombodoPortalInstanceAbsoluteUrl */ /** @var string $sCombodoPortalBaseAbsoluteUrl */
private $sCombodoPortalInstanceAbsoluteUrl; private $sCombodoPortalBaseAbsoluteUrl;
/** @var string|null $sContactPhotoUrl */ /** @var string|null $sContactPhotoUrl */
private $sContactPhotoUrl; private $sContactPhotoUrl;
/** @var \Symfony\Component\DependencyInjection\ContainerInterface */ /** @var \Symfony\Component\DependencyInjection\ContainerInterface */
@@ -49,13 +49,13 @@ class CombodoCurrentContactPhotoUrl
* *
* @param \User $oUser * @param \User $oUser
* @param \Symfony\Component\DependencyInjection\ContainerInterface $oContainer * @param \Symfony\Component\DependencyInjection\ContainerInterface $oContainer
* @param string $sCombodoPortalInstanceAbsoluteUrl * @param string $sCombodoPortalBaseAbsoluteUrl
*/ */
public function __construct(User $oUser, ContainerInterface $oContainer, $sCombodoPortalInstanceAbsoluteUrl) public function __construct(User $oUser, ContainerInterface $oContainer, $sCombodoPortalBaseAbsoluteUrl)
{ {
$this->oUser = $oUser; $this->oUser = $oUser;
$this->oContainer = $oContainer; $this->oContainer = $oContainer;
$this->sCombodoPortalInstanceAbsoluteUrl = $sCombodoPortalInstanceAbsoluteUrl; $this->sCombodoPortalBaseAbsoluteUrl = $sCombodoPortalBaseAbsoluteUrl;
$this->sContactPhotoUrl = null; $this->sContactPhotoUrl = null;
} }
@@ -82,7 +82,7 @@ class CombodoCurrentContactPhotoUrl
private function ComputeContactPhotoUrl() private function ComputeContactPhotoUrl()
{ {
// Contact // Contact
$sContactPhotoUrl = "{$this->sCombodoPortalInstanceAbsoluteUrl}img/user-profile-default-256px.png"; $sContactPhotoUrl = "{$this->sCombodoPortalBaseAbsoluteUrl}img/user-profile-default-256px.png";
// - Checking if we can load the contact // - Checking if we can load the contact
try try
{ {