Jingga/oms-Navigation
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Navigation.git synced 2026-02-16 08:38:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug fix changes

Browse Source
This commit is contained in:
Dennis Eichhorn 2017-09-05 18:47:24 +02:00
parent 8d1505a78d
commit a3d3a3a7c2
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.php
View File

@ -104,7 +104,7 @@ class Controller extends ModuleAbstract implements WebInterface
$navView = new NavigationView($this->app, $request, $response); $navView = new NavigationView($this->app, $request, $response);
$navView->setTemplate('/Modules/Navigation/Theme/Backend/mid'); $navView->setTemplate('/Modules/Navigation/Theme/Backend/mid');
$navView->setNav($nav->getNav()); $navView->setNav($nav->getNav());
$navView->setLanguage($request->getL11n()->getLanguage()); $navView->setLanguage($request->getHeader()->getL11n()->getLanguage());
$navView->setParent($pageId); $navView->setParent($pageId);
return $navView; return $navView;
@ -115,11 +115,11 @@ class Controller extends ModuleAbstract implements WebInterface
$navObj = \Modules\Navigation\Models\Navigation::getInstance($request, $this->app->dbPool); $navObj = \Modules\Navigation\Models\Navigation::getInstance($request, $this->app->dbPool);
$nav = new \Modules\Navigation\Views\NavigationView($this->app, $request, $response); $nav = new \Modules\Navigation\Views\NavigationView($this->app, $request, $response);
$nav->setNav($navObj->getNav()); $nav->setNav($navObj->getNav());
$nav->setLanguage($request->getL11n()->getLanguage()); $nav->setLanguage($request->getHeader()->getL11n()->getLanguage());
$unread = []; $unread = [];
foreach($this->receiving as $receiving) { foreach($this->receiving as $receiving) {
$unread[$receiving] = $this->app->moduleManager->get($receiving)->openNav($request->getAccount()); $unread[$receiving] = $this->app->moduleManager->get($receiving)->openNav($request->getHeader()->getAccount());
} }
$nav->setData('unread', $unread); $nav->setData('unread', $unread);
@ -136,11 +136,11 @@ class Controller extends ModuleAbstract implements WebInterface
continue; continue;
} }
$path = __DIR__ . '/../..' . $path . '.' . $response->getL11n()->getLanguage() . '.lang.php'; $path = __DIR__ . '/../..' . $path . '.' . $response->getHeader()->getL11n()->getLanguage() . '.lang.php';
/** @noinspection PhpIncludeInspection */ /** @noinspection PhpIncludeInspection */
$lang = include $path; $lang = include $path;
$this->app->l11nManager->loadLanguage($response->getL11n()->getLanguage(), 'Navigation', $lang); $this->app->l11nManager->loadLanguage($response->getHeader()->getL11n()->getLanguage(), 'Navigation', $lang);
} }
} }
@ -159,7 +159,7 @@ class Controller extends ModuleAbstract implements WebInterface
$navView = new NavigationView($this->app, $request, $response); $navView = new NavigationView($this->app, $request, $response);
$navView->setTemplate('/Modules/Navigation/Theme/Backend/splash'); $navView->setTemplate('/Modules/Navigation/Theme/Backend/splash');
$navView->setNav($nav->getNav()); $navView->setNav($nav->getNav());
$navView->setLanguage($request->getL11n()->getLanguage()); $navView->setLanguage($request->getHeader()->getL11n()->getLanguage());
$navView->setParent($pageId); $navView->setParent($pageId);
return $navView; return $navView;