Jingga/oms-Tag
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Tag.git synced 2026-01-11 15:48:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

simplify getLanguage call in request

Browse Source
This commit is contained in:
Dennis Eichhorn 2020-11-10 22:15:19 +01:00
parent 0fb3eee6bb
commit dc78eb9d7e
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Controller/ApiController.php
View File

@ -219,14 +219,14 @@ final class ApiController extends Controller
*/
private function createTagL11nFromRequest(RequestAbstract $request) : TagL11n
{
$l11nTag = new TagL11n();
$l11nTag->setTag((int) ($request->getData('tag') ?? 0));
$l11nTag->setLanguage((string) (
$request->getData('language') ?? $request->getHeader()->getL11n()->getLanguage()
$tagL11n = new TagL11n();
$tagL11n->setTag((int) ($request->getData('tag') ?? 0));
$tagL11n->setLanguage((string) (
$request->getData('language') ?? $request->getLanguage()
));
$l11nTag->setTitle((string) ($request->getData('title') ?? ''));
$tagL11n->setTitle((string) ($request->getData('title') ?? ''));
return $l11nTag;
return $tagL11n;
}
/**

8
Controller/BackendController.php
View File

@ -74,17 +74,17 @@ final class BackendController extends Controller
if ($request->getData('ptype') === 'p') {
$view->setData('tags',
TagMapper::withConditional('language', $response->getHeader()->getL11n()->getLanguage())
TagMapper::withConditional('language', $response->getLanguage())
::getBeforePivot((int) ($request->getData('id') ?? 0), null, 25)
);
} elseif ($request->getData('ptype') === 'n') {
$view->setData('tags',
TagMapper::withConditional('language', $response->getHeader()->getL11n()->getLanguage())
TagMapper::withConditional('language', $response->getLanguage())
::getAfterPivot((int) ($request->getData('id') ?? 0), null, 25)
);
} else {
$view->setData('tags',
TagMapper::withConditional('language', $response->getHeader()->getL11n()->getLanguage())
TagMapper::withConditional('language', $response->getLanguage())
::getAfterPivot(0, null, 25)
);
}
@ -107,7 +107,7 @@ final class BackendController extends Controller
public function viewTagSingle(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface
{
$view = new View($this->app->l11nManager, $request, $response);
$tag = TagMapper::withConditional('language', $response->getHeader()->getL11n()->getLanguage())::get((int) $request->getData('id'));
$tag = TagMapper::withConditional('language', $response->getLanguage())::get((int) $request->getData('id'));
$view->setTemplate('/Modules/Tag/Theme/Backend/tag-single');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1007501001, $request, $response));

1
Models/Tag.php
View File

@ -173,6 +173,7 @@ class Tag implements \JsonSerializable, ArrayableInterface
* Set title
*
* @param string|TagL11n $title Tag article title
* @param string $lang Language
*
* @return void
*