Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 5 additions & 28 deletions src/Service/GridData/Asset.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@

namespace Pimcore\Bundle\AdminBundle\Service\GridData;

use Pimcore\Bundle\AdminBundle\Service\ElementService;
use Pimcore\Model;
use Pimcore\Model\Asset\MetaData\ClassDefinition\Data\Data;
use Pimcore\Model\Element\Service;
Expand Down Expand Up @@ -48,7 +49,7 @@ public static function getData(Model\Asset $asset, ?array $fields = null, ?strin
$fieldDef = explode('~', $field);
if (isset($fieldDef[1]) && $fieldDef[1] === 'system') {
if ($fieldDef[0] === 'preview') {
$data[$field] = self::getPreviewThumbnail($asset, ['treepreview' => true, 'width' => 108, 'height' => 70, 'frame' => true]);
$data[$field] = self::getPreviewThumbnail($asset, ['treepreview' => true, 'origin' => 'folderPreview', 'width' => 108, 'height' => 70, 'frame' => true]);
} elseif ($fieldDef[0] === 'size') {
$size = $asset->getFileSize();
$data[$field] = formatBytes($size);
Expand Down Expand Up @@ -90,7 +91,6 @@ public static function getData(Model\Asset $asset, ?array $fields = null, ?strin
public static function getPreviewThumbnail(Model\Asset $asset, array $params = [], bool $onlyMethod = false): ?string
{
$thumbnailMethod = '';
$thumbnailUrl = null;

if ($asset instanceof Model\Asset\Image) {
$thumbnailMethod = 'getThumbnail';
Expand All @@ -104,32 +104,9 @@ public static function getPreviewThumbnail(Model\Asset $asset, array $params = [
return $thumbnailMethod;
}

if (!empty($thumbnailMethod)) {
// Get URL generator from service container
$urlGenerator = \Pimcore::getContainer()->get('router');

// Merge asset ID with params
$routeParams = array_merge(['id' => $asset->getId()], $params);

// Generate URL using the appropriate route
switch (true) {
case $asset instanceof Model\Asset\Image:
$thumbnailUrl = $urlGenerator->generate('pimcore_admin_asset_getimagethumbnail', $routeParams);
break;
case $asset instanceof Model\Asset\Video:
$thumbnailUrl = $urlGenerator->generate('pimcore_admin_asset_getvideothumbnail', $routeParams);
break;
case $asset instanceof Model\Asset\Document:
$thumbnailUrl = $urlGenerator->generate('pimcore_admin_asset_getdocumentthumbnail', $routeParams);
break;
case $asset instanceof Model\Asset\Folder:
$thumbnailUrl = $urlGenerator->generate('pimcore_admin_asset_getfolderthumbnail', $routeParams);
break;
default:
break;
}
}
// Delegate to ElementService to keep list view and tile view behavior aligned
$elementService = \Pimcore::getContainer()->get(ElementService::class);

return $thumbnailUrl;
return $elementService->getThumbnailUrl($asset, $params);
}
}