Jingga/oms-Media
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Media.git synced 2026-02-13 15:58:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

make fixes for new datamapper

Browse Source
This commit is contained in:
Dennis Eichhorn 2020-03-13 23:30:58 +01:00
parent 06b49ba286
commit f069bf670f
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Models/MediaMapper.php
View File

@ -16,6 +16,7 @@ namespace Modules\Media\Models;
use Modules\Admin\Models\AccountMapper; use Modules\Admin\Models\AccountMapper;
use phpOMS\DataStorage\Database\DataMapperAbstract; use phpOMS\DataStorage\Database\DataMapperAbstract;
use phpOMS\DataStorage\Database\RelationType;
/** /**
* Media mapper class. * Media mapper class.
@ -112,14 +113,15 @@ class MediaMapper extends DataMapperAbstract
*/ */
public static function getByVirtualPath(string $virtualPath = '/', bool $hidden = false) : array public static function getByVirtualPath(string $virtualPath = '/', bool $hidden = false) : array
{ {
$depth = 3;
$query = self::getQuery(); $query = self::getQuery();
$query->where(self::$table . '.media_virtual', '=', $virtualPath); $query->where(self::$table . '_' . $depth . '.media_virtual', '=', $virtualPath);
if ($hidden === false) { if ($hidden === false) {
$query->where(self::$table . '.media_hidden', '=', (int) $hidden); $query->where(self::$table . '_' . $depth . '.media_hidden', '=', (int) $hidden);
} }
return self::getAllByQuery($query); return self::getAllByQuery($query, RelationType::ALL, $depth);
} }
/** /**
@ -136,11 +138,12 @@ class MediaMapper extends DataMapperAbstract
$virtualPath = '/' . \trim(\substr($path, 0, \strripos($path, '/') + 1), '/'); $virtualPath = '/' . \trim(\substr($path, 0, \strripos($path, '/') + 1), '/');
$name = \substr($path, \strripos($path, '/') + 1); $name = \substr($path, \strripos($path, '/') + 1);
$depth = 3;
$query = self::getQuery(); $query = self::getQuery();
$query->where(self::$table . '.media_virtual', '=', $virtualPath) $query->where(self::$table. '_' . $depth . '.media_virtual', '=', $virtualPath)
->andWhere(self::$table . '.media_name', '=', $name); ->andWhere(self::$table. '_' . $depth . '.media_name', '=', $name);
$objs = self::getAllByQuery($query); $objs = self::getAllByQuery($query, RelationType::ALL, $depth);
return \count($objs) === 1 ? \reset($objs) : $objs; return \count($objs) === 1 ? \reset($objs) : $objs;
} }