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

continue with getter/setter removal

Browse Source
This commit is contained in:
Dennis Eichhorn 2023-05-30 04:15:38 +02:00
parent 9dc77f464f
commit 3b8540bf6d
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Controller/ApiController.php
View File

@ -1370,7 +1370,7 @@ final class ApiController extends Controller
if ($request->hasData('title')) { if ($request->hasData('title')) {
$type->setL11n( $type->setL11n(
$request->getDataString('title') ?? '', $request->getDataString('title') ?? '',
$request->getDataString('lang') ?? $request->getLanguage() $request->getDataString('lang') ?? $request->header->l11n->language
); );
} }
@ -1441,7 +1441,7 @@ final class ApiController extends Controller
$l11nMediaType->ref = $request->getDataInt('type') ?? 0; $l11nMediaType->ref = $request->getDataInt('type') ?? 0;
$l11nMediaType->content = $request->getDataString('title') ?? ''; $l11nMediaType->content = $request->getDataString('title') ?? '';
$l11nMediaType->setLanguage( $l11nMediaType->setLanguage(
$request->getDataString('language') ?? $request->getLanguage() $request->getDataString('language') ?? $request->header->l11n->language
); );
return $l11nMediaType; return $l11nMediaType;

14
Controller/BackendController.php
View File

@ -85,7 +85,7 @@ final class BackendController extends Controller
PermissionCategory::MEDIA, PermissionCategory::MEDIA,
); );
$mediaMapper = MediaMapper::getByVirtualPath($path)->where('tags/title/language', $request->getLanguage()); $mediaMapper = MediaMapper::getByVirtualPath($path)->where('tags/title/language', $request->header->l11n->language);
if (!$hasPermission) { if (!$hasPermission) {
$permWhere = PermissionAbstractMapper::helper($this->app->dbPool->get('select')) $permWhere = PermissionAbstractMapper::helper($this->app->dbPool->get('select'))
@ -104,7 +104,7 @@ final class BackendController extends Controller
/** @var Media[] $media */ /** @var Media[] $media */
$media = $mediaMapper->execute(); $media = $mediaMapper->execute();
$collectionMapper = CollectionMapper::getParentCollection($path)->where('tags/title/language', $request->getLanguage()); $collectionMapper = CollectionMapper::getParentCollection($path)->where('tags/title/language', $request->header->l11n->language);
if (!$hasPermission) { if (!$hasPermission) {
$permWhere = PermissionAbstractMapper::helper($this->app->dbPool->get('select')) $permWhere = PermissionAbstractMapper::helper($this->app->dbPool->get('select'))
@ -232,14 +232,14 @@ final class BackendController extends Controller
->with('tags/title') ->with('tags/title')
->with('content') ->with('content')
->where('id', $id) ->where('id', $id)
->where('tags/title/language', $request->getLanguage()) ->where('tags/title/language', $request->header->l11n->language)
->execute(); ->execute();
if ($media->class === MediaClass::COLLECTION) { if ($media->class === MediaClass::COLLECTION) {
/** @var \Modules\Media\Models\Media[] $files */ /** @var \Modules\Media\Models\Media[] $files */
$files = MediaMapper::getByVirtualPath( $files = MediaMapper::getByVirtualPath(
$media->getVirtualPath() . ($media->getVirtualPath() !== '/' ? '/' : '') . $media->name $media->getVirtualPath() . ($media->getVirtualPath() !== '/' ? '/' : '') . $media->name
)->where('tags/title/language', $request->getLanguage())->execute(); )->where('tags/title/language', $request->header->l11n->language)->execute();
/** @var \Modules\Media\Models\Collection $collection */ /** @var \Modules\Media\Models\Collection $collection */
$collection = CollectionMapper::get()->where('id', $id)->execute(); $collection = CollectionMapper::get()->where('id', $id)->execute();
@ -264,7 +264,7 @@ final class BackendController extends Controller
->with('tags/title') ->with('tags/title')
->with('content') ->with('content')
->where('id', $media->source?->id ?? 0) ->where('id', $media->source?->id ?? 0)
->where('tags/title/language', $request->getLanguage()) ->where('tags/title/language', $request->header->l11n->language)
->execute(); ->execute();
$view->addData('view', $this->createMediaView($media->source, $request, $response)); $view->addData('view', $this->createMediaView($media->source, $request, $response));
@ -398,7 +398,7 @@ final class BackendController extends Controller
$settings = SettingMapper::getAll()->where('module', $id)->execute(); $settings = SettingMapper::getAll()->where('module', $id)->execute();
$view->setData('settings', $settings); $view->setData('settings', $settings);
$types = MediaTypeMapper::getAll()->with('title')->where('title/language', $response->getLanguage())->execute(); $types = MediaTypeMapper::getAll()->with('title')->where('title/language', $response->header->l11n->language)->execute();
$view->setData('types', $types); $view->setData('types', $types);
$view->setTemplate('/Modules/' . static::NAME . '/Admin/Settings/Theme/Backend/settings'); $view->setTemplate('/Modules/' . static::NAME . '/Admin/Settings/Theme/Backend/settings');
@ -426,7 +426,7 @@ final class BackendController extends Controller
/** @var \phpOMS\Localization\BaseStringL11n $type */ /** @var \phpOMS\Localization\BaseStringL11n $type */
$type = MediaTypeMapper::get() $type = MediaTypeMapper::get()
->with('title') ->with('title')
->where('title/language', $response->getLanguage()) ->where('title/language', $response->header->l11n->language)
->where('id', (int) $request->getData('id')) ->where('id', (int) $request->getData('id'))
->execute(); ->execute();