diff --git a/Controller/BackendController.php b/Controller/BackendController.php index c1a3311..6274da2 100755 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -210,7 +210,7 @@ final class BackendController extends Controller $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-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; } diff --git a/Controller/Controller.php b/Controller/Controller.php index d7b2264..2a651ce 100755 --- a/Controller/Controller.php +++ b/Controller/Controller.php @@ -14,7 +14,6 @@ declare(strict_types=1); namespace Modules\Navigation\Controller; -use Modules\Navigation\Models\Navigation; use phpOMS\Module\ModuleAbstract; /** diff --git a/Models/NavElementMapper.php b/Models/NavElementMapper.php index 5564a1d..c4856aa 100755 --- a/Models/NavElementMapper.php +++ b/Models/NavElementMapper.php @@ -33,24 +33,24 @@ final class NavElementMapper extends DataMapperFactory * @since 1.0.0 */ public const COLUMNS = [ - 'nav_id' => ['name' => 'nav_id', 'type' => 'int', 'internal' => 'id'], - 'nav_app' => ['name' => 'nav_app', 'type' => 'int', 'internal' => 'app'], - 'nav_pid' => ['name' => 'nav_pid', 'type' => 'string', 'internal' => 'pid'], - 'nav_pid_raw' => ['name' => 'nav_pid_raw', 'type' => 'string', 'internal' => 'pidRaw'], - 'nav_name' => ['name' => 'nav_name', 'type' => 'string', 'internal' => 'name'], - 'nav_type' => ['name' => 'nav_type', 'type' => 'int', 'internal' => 'type'], - 'nav_subtype' => ['name' => 'nav_subtype', 'type' => 'int', 'internal' => 'subtype'], - 'nav_icon' => ['name' => 'nav_icon', 'type' => 'string', 'internal' => 'icon'], - 'nav_uri' => ['name' => 'nav_uri', 'type' => 'string', 'internal' => 'uri'], - 'nav_target' => ['name' => 'nav_target', 'type' => 'string', 'internal' => 'target'], - 'nav_action' => ['name' => 'nav_action', 'type' => 'string', 'internal' => 'action'], - 'nav_from' => ['name' => 'nav_from', 'type' => 'string', 'internal' => 'from'], - 'nav_order' => ['name' => 'nav_order', 'type' => 'int', 'internal' => 'order'], - 'nav_parent' => ['name' => 'nav_parent', 'type' => 'int', 'internal' => 'parent'], - 'nav_permission_permission' => ['name' => 'nav_permission_permission', 'type' => 'int', 'internal' => 'permissionPerm'], - 'nav_permission_type' => ['name' => 'nav_permission_type', 'type' => 'int', 'internal' => 'permissionType'], - 'nav_permission_element' => ['name' => 'nav_permission_element', 'type' => 'int', 'internal' => 'permissionElement'], - 'nav_status' => ['name' => 'nav_status', 'type' => 'int', 'internal' => 'status'], + 'nav_id' => ['name' => 'nav_id', 'type' => 'int', 'internal' => 'id'], + 'nav_app' => ['name' => 'nav_app', 'type' => 'int', 'internal' => 'app'], + 'nav_pid' => ['name' => 'nav_pid', 'type' => 'string', 'internal' => 'pid'], + 'nav_pid_raw' => ['name' => 'nav_pid_raw', 'type' => 'string', 'internal' => 'pidRaw'], + 'nav_name' => ['name' => 'nav_name', 'type' => 'string', 'internal' => 'name'], + 'nav_type' => ['name' => 'nav_type', 'type' => 'int', 'internal' => 'type'], + 'nav_subtype' => ['name' => 'nav_subtype', 'type' => 'int', 'internal' => 'subtype'], + 'nav_icon' => ['name' => 'nav_icon', 'type' => 'string', 'internal' => 'icon'], + 'nav_uri' => ['name' => 'nav_uri', 'type' => 'string', 'internal' => 'uri'], + 'nav_target' => ['name' => 'nav_target', 'type' => 'string', 'internal' => 'target'], + 'nav_action' => ['name' => 'nav_action', 'type' => 'string', 'internal' => 'action'], + 'nav_from' => ['name' => 'nav_from', 'type' => 'string', 'internal' => 'from'], + 'nav_order' => ['name' => 'nav_order', 'type' => 'int', 'internal' => 'order'], + 'nav_parent' => ['name' => 'nav_parent', 'type' => 'int', 'internal' => 'parent'], + 'nav_permission_permission' => ['name' => 'nav_permission_permission', 'type' => 'int', 'internal' => 'permissionPerm'], + 'nav_permission_type' => ['name' => 'nav_permission_type', 'type' => 'int', 'internal' => 'permissionType'], + 'nav_permission_element' => ['name' => 'nav_permission_element', 'type' => 'int', 'internal' => 'permissionElement'], + 'nav_status' => ['name' => 'nav_status', 'type' => 'int', 'internal' => 'status'], ]; /** diff --git a/Theme/Backend/Lang/en.lang.php b/Theme/Backend/Lang/en.lang.php index 5ec556f..5086488 100755 --- a/Theme/Backend/Lang/en.lang.php +++ b/Theme/Backend/Lang/en.lang.php @@ -13,11 +13,11 @@ declare(strict_types=1); return ['Navigation' => [ - 'PageId' => 'PageId', - 'Name' => 'Name', - 'Type' => 'Type', - 'Subtype' => 'Subtype', - 'Uri' => 'Uri', - 'Provider' => 'Provider', - 'Parent' => 'Parent', + 'PageId' => 'PageId', + 'Name' => 'Name', + 'Type' => 'Type', + 'Subtype' => 'Subtype', + 'Uri' => 'Uri', + 'Provider' => 'Provider', + 'Parent' => 'Parent', ]]; diff --git a/Theme/Backend/mid-side.tpl.php b/Theme/Backend/mid-side.tpl.php index e1f29db..f243061 100755 --- a/Theme/Backend/mid-side.tpl.php +++ b/Theme/Backend/mid-side.tpl.php @@ -30,7 +30,7 @@ if (isset($this->nav[\Modules\Navigation\Models\NavigationType::CONTENT_SIDE])) /** @var array $data */ if ($link['nav_parent'] == $data[1]) { echo '