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

bug fixes / dbmapper fixes

Browse Source
This commit is contained in:
Dennis Eichhorn 2021-12-19 20:20:39 +01:00
parent f7a9b08e74
commit 97f3e61864
5 changed files with 27 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Controller/BackendController.php
View File

@ -210,7 +210,7 @@ final class BackendController extends Controller
$view->setTemplate('/Modules/' . static::NAME . '/Admin/Settings/Theme/Backend/settings-nav'); $view->setTemplate('/Modules/' . static::NAME . '/Admin/Settings/Theme/Backend/settings-nav');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000105001, $request, $response)); $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000105001, $request, $response));
$view->addData('nav-element', NavElementMapper::get()->where('id', (int) $request->getData('nav')))->execute(); $view->addData('nav-element', NavElementMapper::get()->where('id', (int) $request->getData('nav'))->execute());
return $view; return $view;
} }

1
Controller/Controller.php
View File

@ -14,7 +14,6 @@ declare(strict_types=1);
namespace Modules\Navigation\Controller; namespace Modules\Navigation\Controller;
use Modules\Navigation\Models\Navigation;
use phpOMS\Module\ModuleAbstract; use phpOMS\Module\ModuleAbstract;
/** /**

36
Models/NavElementMapper.php
View File

@ -33,24 +33,24 @@ final class NavElementMapper extends DataMapperFactory
* @since 1.0.0 * @since 1.0.0
*/ */
public const COLUMNS = [ public const COLUMNS = [
'nav_id' => ['name' => 'nav_id', 'type' => 'int', 'internal' => 'id'], 'nav_id' => ['name' => 'nav_id', 'type' => 'int', 'internal' => 'id'],
'nav_app' => ['name' => 'nav_app', 'type' => 'int', 'internal' => 'app'], 'nav_app' => ['name' => 'nav_app', 'type' => 'int', 'internal' => 'app'],
'nav_pid' => ['name' => 'nav_pid', 'type' => 'string', 'internal' => 'pid'], 'nav_pid' => ['name' => 'nav_pid', 'type' => 'string', 'internal' => 'pid'],
'nav_pid_raw' => ['name' => 'nav_pid_raw', 'type' => 'string', 'internal' => 'pidRaw'], 'nav_pid_raw' => ['name' => 'nav_pid_raw', 'type' => 'string', 'internal' => 'pidRaw'],
'nav_name' => ['name' => 'nav_name', 'type' => 'string', 'internal' => 'name'], 'nav_name' => ['name' => 'nav_name', 'type' => 'string', 'internal' => 'name'],
'nav_type' => ['name' => 'nav_type', 'type' => 'int', 'internal' => 'type'], 'nav_type' => ['name' => 'nav_type', 'type' => 'int', 'internal' => 'type'],
'nav_subtype' => ['name' => 'nav_subtype', 'type' => 'int', 'internal' => 'subtype'], 'nav_subtype' => ['name' => 'nav_subtype', 'type' => 'int', 'internal' => 'subtype'],
'nav_icon' => ['name' => 'nav_icon', 'type' => 'string', 'internal' => 'icon'], 'nav_icon' => ['name' => 'nav_icon', 'type' => 'string', 'internal' => 'icon'],
'nav_uri' => ['name' => 'nav_uri', 'type' => 'string', 'internal' => 'uri'], 'nav_uri' => ['name' => 'nav_uri', 'type' => 'string', 'internal' => 'uri'],
'nav_target' => ['name' => 'nav_target', 'type' => 'string', 'internal' => 'target'], 'nav_target' => ['name' => 'nav_target', 'type' => 'string', 'internal' => 'target'],
'nav_action' => ['name' => 'nav_action', 'type' => 'string', 'internal' => 'action'], 'nav_action' => ['name' => 'nav_action', 'type' => 'string', 'internal' => 'action'],
'nav_from' => ['name' => 'nav_from', 'type' => 'string', 'internal' => 'from'], 'nav_from' => ['name' => 'nav_from', 'type' => 'string', 'internal' => 'from'],
'nav_order' => ['name' => 'nav_order', 'type' => 'int', 'internal' => 'order'], 'nav_order' => ['name' => 'nav_order', 'type' => 'int', 'internal' => 'order'],
'nav_parent' => ['name' => 'nav_parent', 'type' => 'int', 'internal' => 'parent'], 'nav_parent' => ['name' => 'nav_parent', 'type' => 'int', 'internal' => 'parent'],
'nav_permission_permission' => ['name' => 'nav_permission_permission', 'type' => 'int', 'internal' => 'permissionPerm'], 'nav_permission_permission' => ['name' => 'nav_permission_permission', 'type' => 'int', 'internal' => 'permissionPerm'],
'nav_permission_type' => ['name' => 'nav_permission_type', 'type' => 'int', 'internal' => 'permissionType'], 'nav_permission_type' => ['name' => 'nav_permission_type', 'type' => 'int', 'internal' => 'permissionType'],
'nav_permission_element' => ['name' => 'nav_permission_element', 'type' => 'int', 'internal' => 'permissionElement'], 'nav_permission_element' => ['name' => 'nav_permission_element', 'type' => 'int', 'internal' => 'permissionElement'],
'nav_status' => ['name' => 'nav_status', 'type' => 'int', 'internal' => 'status'], 'nav_status' => ['name' => 'nav_status', 'type' => 'int', 'internal' => 'status'],
]; ];
/** /**

14
Theme/Backend/Lang/en.lang.php
View File

@ -13,11 +13,11 @@
declare(strict_types=1); declare(strict_types=1);
return ['Navigation' => [ return ['Navigation' => [
'PageId' => 'PageId', 'PageId' => 'PageId',
'Name' => 'Name', 'Name' => 'Name',
'Type' => 'Type', 'Type' => 'Type',
'Subtype' => 'Subtype', 'Subtype' => 'Subtype',
'Uri' => 'Uri', 'Uri' => 'Uri',
'Provider' => 'Provider', 'Provider' => 'Provider',
'Parent' => 'Parent', 'Parent' => 'Parent',
]]; ]];

2
Theme/Backend/mid-side.tpl.php
View File

@ -30,7 +30,7 @@ if (isset($this->nav[\Modules\Navigation\Models\NavigationType::CONTENT_SIDE]))
/** @var array $data */ /** @var array $data */
if ($link['nav_parent'] == $data[1]) { if ($link['nav_parent'] == $data[1]) {
echo '<li><a href="' . \phpOMS\Uri\UriFactory::build($link['nav_uri']) . '">' echo '<li><a href="' . \phpOMS\Uri\UriFactory::build($link['nav_uri']) . '">'
. $this->getHtml(5, 'Backend', $link['nav_name']) . '</a>'; . $this->getHtml('5', 'Backend', $link['nav_name']) . '</a>';
} }
} }
} }