composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-19 07:12:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

N°2323.7 Fix images display in browse brick as a list

Browse Source
This commit is contained in:
Molkobain
2019-07-15 12:08:13 +02:00
parent a0cd70ae71
commit 2237ec581c
1 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
datamodels/2.x/itop-portal-base/portal/src/Helper/BrowseBrickHelper.php
View File

@@ -25,6 +25,7 @@ namespace Combodo\iTop\Portal\Helper;
use AttributeImage; use AttributeImage;
use AttributeTagSet;
use Combodo\iTop\Portal\Brick\BrowseBrick; use Combodo\iTop\Portal\Brick\BrowseBrick;
use DBSearch; use DBSearch;
use Dict; use Dict;
@@ -375,17 +376,37 @@ class BrowseBrickHelper
{ {
$oAttDef = MetaModel::GetAttributeDef(get_class($value), $aField['code']); $oAttDef = MetaModel::GetAttributeDef(get_class($value), $aField['code']);
switch (get_class($oAttDef)) switch (true)
{ {
case 'AttributeTagSet': case $oAttDef instanceof AttributeTagSet:
/** @var \ormTagSet $oSetValues */ /** @var \ormTagSet $oSetValues */
$oSetValues = $value->Get($aField['code']); $oSetValues = $value->Get($aField['code']);
$aCodes = $oSetValues->GetTags(); $aCodes = $oSetValues->GetTags();
/** @var \AttributeTagSet $oAttDef */ /** @var \AttributeTagSet $oAttDef */
$sHtmlForFieldValue = $oAttDef->GenerateViewHtmlForValues($aCodes, '', false); $sHtmlForFieldValue = $oAttDef->GenerateViewHtmlForValues($aCodes, '', false);
break; break;
case $oAttDef instanceof AttributeImage:
// Todo: This should be refactored, it has been seen multiple times in the portal
$oOrmDoc = $value->Get($aField['code']);
if (is_object($oOrmDoc) && !$oOrmDoc->IsEmpty())
{
$sUrl = $this->oUrlGenerator->generate('p_object_document_display', array(
'sObjectClass' => get_class($value),
'sObjectId' => $value->GetKey(),
'sObjectField' => $aField['code'],
'cache' => 86400,
));
}
else
{
$sUrl = $oAttDef->Get('default_image');
}
$sHtmlForFieldValue = '<img src="'.$sUrl.'" />';
break;
default: default:
$sHtmlForFieldValue = $oAttDef->GetAsHTML($value->Get($aField['code'])); $sHtmlForFieldValue = $oAttDef->GetAsHTML($value->Get($aField['code']), $value);
break; break;
} }