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

N°4911 - Mentions: Fix Person picture not displayed if marker configured on parent class (Contact)

Browse Source
This commit is contained in:
Molkobain
2022-03-06 12:49:11 +01:00
parent 2299983db3
commit 106127e6b7
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pages/ajax.render.php
View File

@@ -2507,8 +2507,6 @@ EOF
$sSearchMainClassName = $oSearch->GetClass();
$sSearchMainClassAlias = $oSearch->GetClassAlias();
$sObjectImageAttCode = MetaModel::GetImageAttributeCode($sSearchMainClassName);
// Add condition to filter on the friendlyname
$oSearch->AddConditionExpression(
new BinaryExpression(new FieldExpression('friendlyname', $sSearchMainClassAlias), 'LIKE', new VariableExpression('needle'))
@@ -2521,7 +2519,7 @@ EOF
$oSet->SetShowObsoleteData(utils::ShowObsoleteData());
while ($oObject = $oSet->Fetch()) {
// Note $oObject finalclass might be different than $sMentionedClass
// Note: $oObject finalclass might be different than $sMentionedClass
$sObjectClass = get_class($oObject);
$iObjectId = $oObject->GetKey();
$aMatch = [
@@ -2530,7 +2528,8 @@ EOF
'friendlyname' => $oObject->Get('friendlyname'),
];
// Try to retrieve image for contact
// Try to retrieve image for object (Don't do it outside of the loop as $oObject can be from different classes)
$sObjectImageAttCode = MetaModel::GetImageAttributeCode($sObjectClass);
if (!empty($sObjectImageAttCode)) {
/** @var \ormDocument $oImage */
$oImage = $oObject->Get($sObjectImageAttCode);