Joost/pics
1
0
Fork 0
forked from Public/pics
Code Issues Pull Requests Projects Releases Wiki Activity

ManageAssets: add thumbnails to asset table

Browse Source
This commit is contained in:
Aaron van Geffen
2024-08-27 12:00:46 +02:00
parent 01954d4a7d
commit 814a1f82f6
3 changed files with 32 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
models/Asset.php
View File

@@ -32,7 +32,7 @@ class Asset
$this->$attribute = $value;
}
if (!empty($data['date_captured']) && $data['date_captured'] !== 'NULL')
if (isset($data['date_captured']) && $data['date_captured'] !== 'NULL' && !is_object($data['date_captured']))
$this->date_captured = new DateTime($data['date_captured']);
}
@@ -108,7 +108,7 @@ class Asset
'_' => '_',
]);
return $return_format == 'object' ? new Asset($row) : $row;
return $return_format === 'object' ? new static($row) : $row;
}
public static function fromIds(array $id_assets, $return_format = 'array')
@@ -168,7 +168,7 @@ class Asset
foreach ($thumbnails as $thumb)
$assets[$thumb[0]]['thumbnails'][$thumb[1]] = $thumb[2];
if ($return_format == 'array')
if ($return_format === 'array')
return $assets;
else
{

6
models/Image.php
View File

@@ -12,12 +12,6 @@ class Image extends Asset
const TYPE_LANDSCAPE = 2;
const TYPE_PORTRAIT = 4;
protected function __construct(array $data)
{
foreach ($data as $attribute => $value)
$this->$attribute = $value;
}
public static function fromId($id_asset, $return_format = 'object')
{
$asset = parent::fromId($id_asset, 'array');