Jingga/oms-Script
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Script.git synced 2026-01-16 22:58:40 +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:10:37 +01:00
parent 6eb9ac8984
commit bc7c0912aa
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Controller/ApiController.php
View File

@ -273,7 +273,7 @@ final class ApiController extends Controller
}
$view->addData('tcoll', $tcoll);
$view->addData('lang', $request->getData('lang') ?? $request->getHeader()->getL11n()->getLanguage());
$view->addData('lang', $request->getData('lang') ?? $request->getLanguage());
$view->addData('template', $template);
$view->addData('basepath', __DIR__ . '/../../../');

6
Controller/BackendController.php
View File

@ -60,7 +60,7 @@ final class BackendController extends Controller
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1002701001, $request, $response));
$path = \str_replace('+', ' ', (string) ($request->getData('path') ?? '/'));
$templates = TemplateMapper::withConditional('language', $response->getHeader()->getL11n()->getLanguage())::getByVirtualPath($path);
$templates = TemplateMapper::withConditional('language', $response->getLanguage())::getByVirtualPath($path);
list($collection, $parent) = CollectionMapper::getCollectionsByPath($path);
@ -144,7 +144,7 @@ final class BackendController extends Controller
//$file = preg_replace('([^\w\s\d\-_~,;:\.\[\]\(\).])', '', $template->getName());
/** @var Template $template */
$template = TemplateMapper::withConditional('language', $response->getHeader()->getL11n()->getLanguage())::get((int) $request->getData('id'));
$template = TemplateMapper::withConditional('language', $response->getLanguage())::get((int) $request->getData('id'));
$view->setTemplate('/Modules/Helper/Theme/Backend/helper-single');
@ -212,7 +212,7 @@ final class BackendController extends Controller
$view->addData('unit', $this->app->orgId);
$view->addData('tcoll', $tcoll);
$view->addData('lang', $request->getData('lang') ?? $request->getHeader()->getL11n()->getLanguage());
$view->addData('lang', $request->getData('lang') ?? $request->getLanguage());
$view->addData('template', $template);
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1002701001, $request, $response));