many small fixes

This commit is contained in:
Dennis Eichhorn 2023-02-10 18:20:57 +01:00
parent 6e8b986b0c
commit b13b3c9018
2 changed files with 28 additions and 6 deletions

View File

@ -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;

View File

@ -60,7 +60,7 @@ echo $this->getData('nav')->render(); ?>
<td><a href="#"><i class="fa fa-times"></i></a>
<td><a href="#"><i class="fa fa-cogs"></i></a>
<td><?= ISO639Enum::getByName('_' . \strtoupper($value->getLanguage())); ?>
<td><?= $value->title; ?>
<td><?= $value->content; ?>
<?php endforeach; ?>
<?php if ($c === 0) : ?>
<tr><td colspan="3" class="empty"><?= $this->getHtml('Empty', '0', '0'); ?>