Jingga/oms-Tasks
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Tasks.git synced 2026-02-15 14:18:41 +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:33 +01:00
parent 8b9050cb56
commit 936004a8d2
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Controller/BackendController.php
View File

@ -74,17 +74,17 @@ final class BackendController extends Controller implements DashboardElementInte
if ($request->getData('ptype') === 'p') { if ($request->getData('ptype') === 'p') {
$view->setData('tasks', $view->setData('tasks',
TaskMapper::withConditional('language', $response->getHeader()->getL11n()->getLanguage()) TaskMapper::withConditional('language', $response->getLanguage())
::getAnyBeforePivot($request->getHeader()->getAccount(), (int) ($request->getData('id') ?? 0), null, 25) ::getAnyBeforePivot($request->getHeader()->getAccount(), (int) ($request->getData('id') ?? 0), null, 25)
); );
} elseif ($request->getData('ptype') === 'n') { } elseif ($request->getData('ptype') === 'n') {
$view->setData('tasks', $view->setData('tasks',
TaskMapper::withConditional('language', $response->getHeader()->getL11n()->getLanguage()) TaskMapper::withConditional('language', $response->getLanguage())
::getAnyAfterPivot($request->getHeader()->getAccount(), (int) ($request->getData('id') ?? 0), null, 25) ::getAnyAfterPivot($request->getHeader()->getAccount(), (int) ($request->getData('id') ?? 0), null, 25)
); );
} else { } else {
$view->setData('tasks', $view->setData('tasks',
TaskMapper::withConditional('language', $response->getHeader()->getL11n()->getLanguage()) TaskMapper::withConditional('language', $response->getLanguage())
::getAnyAfterPivot($request->getHeader()->getAccount(), 0, null, 25) ::getAnyAfterPivot($request->getHeader()->getAccount(), 0, null, 25)
); );
} }
@ -132,8 +132,8 @@ final class BackendController extends Controller implements DashboardElementInte
$view->setTemplate('/Web/Backend/Error/403'); $view->setTemplate('/Web/Backend/Error/403');
$this->app->loadLanguageFromPath( $this->app->loadLanguageFromPath(
$response->getHeader()->getL11n()->getLanguage(), $response->getLanguage(),
__DIR__ . '/../../../Web/Backend/Error/lang/' . $response->getHeader()->getL11n()->getLanguage() . '.lang.php' __DIR__ . '/../../../Web/Backend/Error/lang/' . $response->getLanguage() . '.lang.php'
); );
return $view; return $view;
@ -143,7 +143,7 @@ final class BackendController extends Controller implements DashboardElementInte
$head = $response->get('Content')->getData('head'); $head = $response->get('Content')->getData('head');
$head->addAsset(AssetType::CSS, 'Modules/Tasks/Theme/Backend/css/styles.css'); $head->addAsset(AssetType::CSS, 'Modules/Tasks/Theme/Backend/css/styles.css');
$task = TaskMapper::withConditional('language', $response->getHeader()->getL11n()->getLanguage())::get((int) $request->getData('id'), RelationType::ALL, 4); $task = TaskMapper::withConditional('language', $response->getLanguage())::get((int) $request->getData('id'), RelationType::ALL, 4);
$accountId = $request->getHeader()->getAccount(); $accountId = $request->getHeader()->getAccount();
if (!($task->getCreatedBy()->getId() === $accountId if (!($task->getCreatedBy()->getId() === $accountId