From b13b3c9018da43d191afa0cf9df6cdbdb0263c79 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Fri, 10 Feb 2023 18:20:57 +0100 Subject: [PATCH] many small fixes --- Controller/BackendController.php | 32 +++++++++++++++++++++++++++----- Theme/Backend/tag-single.tpl.php | 2 +- 2 files changed, 28 insertions(+), 6 deletions(-) diff --git a/Controller/BackendController.php b/Controller/BackendController.php index 4dc91b2..3ff179d 100755 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -75,15 +75,30 @@ final class BackendController extends Controller if ($request->getData('ptype') === 'p') { $view->setData('tags', - TagMapper::getAll()->with('title')->where('id', (int) ($request->getData('id') ?? 0), '<')->where('title/language', $request->getLanguage())->limit(25)->execute() + TagMapper::getAll() + ->with('title') + ->where('id', (int) ($request->getData('id') ?? 0), '<') + ->where('title/language', $request->getLanguage()) + ->limit(25) + ->execute() ); } elseif ($request->getData('ptype') === 'n') { $view->setData('tags', - TagMapper::getAll()->with('title')->where('id', (int) ($request->getData('id') ?? 0), '>')->where('title/language', $request->getLanguage())->limit(25)->execute() + TagMapper::getAll() + ->with('title') + ->where('id', (int) ($request->getData('id') ?? 0), '>') + ->where('title/language', $request->getLanguage()) + ->limit(25) + ->execute() ); } else { $view->setData('tags', - TagMapper::getAll()->with('title')->where('id', 0, '>')->where('title/language', $request->getLanguage())->limit(25)->execute() + TagMapper::getAll() + ->with('title') + ->where('id', 0, '>') + ->where('title/language', $request->getLanguage()) + ->limit(25) + ->execute() ); } @@ -107,14 +122,21 @@ final class BackendController extends Controller $view = new View($this->app->l11nManager, $request, $response); /** @var \Modules\Tag\Models\Tag $tag */ - $tag = TagMapper::get()->with('title')->where('id', (int) $request->getData('id'))->where('title/language', $response->getLanguage())->execute(); + $tag = TagMapper::get() + ->with('title') + ->where('id', (int) $request->getData('id')) + ->where('title/language', $response->getLanguage()) + ->execute(); $view->setTemplate('/Modules/Tag/Theme/Backend/tag-single'); $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1007501001, $request, $response)); $view->addData('tag', $tag); /** @var \phpOMS\Localization\BaseStringL11n[] $l11n */ - $l11n = TagL11nMapper::getAll()->where('tag', $tag->getId())->execute(); + $l11n = TagL11nMapper::getAll() + ->where('ref', $tag->getId()) + ->execute(); + $view->addData('l11n', $l11n); return $view; diff --git a/Theme/Backend/tag-single.tpl.php b/Theme/Backend/tag-single.tpl.php index ff945bc..159e0a5 100755 --- a/Theme/Backend/tag-single.tpl.php +++ b/Theme/Backend/tag-single.tpl.php @@ -60,7 +60,7 @@ echo $this->getData('nav')->render(); ?> getLanguage())); ?> - title; ?> + content; ?> getHtml('Empty', '0', '0'); ?>