Jingga/oms-Dashboard
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Dashboard.git synced 2026-02-17 02:48:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix para and dashboard bug

Browse Source
This commit is contained in:
Dennis Eichhorn 2022-03-18 19:54:12 +01:00
parent 56e47a92ae
commit bb502a85e8
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Admin/Installer.php
View File

@ -101,7 +101,7 @@ final class Installer extends InstallerAbstract
]; ];
foreach ($dashboardData as $dashboard) { foreach ($dashboardData as $dashboard) {
switch ($dashboard['component']) { switch ($dashboard['type']) {
case 'component': case 'component':
$result['component'][] = self::createComponent($app->dbPool, $dashboard); $result['component'][] = self::createComponent($app->dbPool, $dashboard);
break; break;

9
Controller/BackendController.php
View File

@ -51,7 +51,10 @@ final class BackendController extends Controller
$view->setTemplate('/Modules/Dashboard/Theme/Backend/dashboard'); $view->setTemplate('/Modules/Dashboard/Theme/Backend/dashboard');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000301001, $request, $response)); $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000301001, $request, $response));
$board = DashboardBoardMapper::get()->where('account', $request->header->account)->execute(); $board = DashboardBoardMapper::get()
->with('components')
->where('account', $request->header->account)
->execute();
if ($board instanceof NullDashboardBoard) { if ($board instanceof NullDashboardBoard) {
$board = DashboardBoardMapper::get()->where('id', 1)->execute(); $board = DashboardBoardMapper::get()->where('id', 1)->execute();
@ -61,11 +64,11 @@ final class BackendController extends Controller
$boardComponents = $board->getComponents(); $boardComponents = $board->getComponents();
foreach ($boardComponents as $component) { foreach ($boardComponents as $component) {
if (!$this->app->moduleManager->isActive($component->getModule())) { if (!$this->app->moduleManager->isActive($component->module)) {
continue; continue;
} }
$module = $this->app->moduleManager->get($component->getModule()); $module = $this->app->moduleManager->get($component->module);
if ($module instanceof DashboardElementInterface) { if ($module instanceof DashboardElementInterface) {
$panels[] = $module->viewDashboard($request, $response, $data); $panels[] = $module->viewDashboard($request, $response, $data);
} }