diff --git a/Admin/Routes/Web/Backend.php b/Admin/Routes/Web/Backend.php index 201096e..cc281e0 100755 --- a/Admin/Routes/Web/Backend.php +++ b/Admin/Routes/Web/Backend.php @@ -13,7 +13,6 @@ declare(strict_types=1); use Modules\Navigation\Controller\BackendController; -use Modules\Navigation\Models\PermissionState; use phpOMS\Account\PermissionType; use phpOMS\Router\RouteVerb; diff --git a/Admin/Settings/Theme/Backend/settings.tpl.php b/Admin/Settings/Theme/Backend/settings.tpl.php index f01e5c5..06483ff 100644 --- a/Admin/Settings/Theme/Backend/settings.tpl.php +++ b/Admin/Settings/Theme/Backend/settings.tpl.php @@ -15,7 +15,7 @@ declare(strict_types=1); use phpOMS\Uri\UriFactory; /** - * @var \phpOMS\Views\View $this + * @var \phpOMS\Views\View $this * @var \Modules\Navigation\Models\NavElement[] $navs */ $navs = $this->getData('navigation') ?? []; diff --git a/Controller/BackendController.php b/Controller/BackendController.php index 241e4ef..8714ee5 100755 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -14,15 +14,15 @@ declare(strict_types=1); namespace Modules\Navigation\Controller; +use Model\NullSetting; +use Model\SettingMapper; +use Modules\Navigation\Models\NavElementMapper; use Modules\Navigation\Models\Navigation; use Modules\Navigation\Views\NavigationView; +use phpOMS\Contract\RenderableInterface; use phpOMS\Message\RequestAbstract; use phpOMS\Message\ResponseAbstract; -use Model\SettingMapper; -use Model\NullSetting; -use Modules\Navigation\Models\NavElementMapper; use phpOMS\Views\View; -use phpOMS\Contract\RenderableInterface; /** * Navigation class. diff --git a/Models/NavElementMapper.php b/Models/NavElementMapper.php index e54d275..6766eca 100755 --- a/Models/NavElementMapper.php +++ b/Models/NavElementMapper.php @@ -33,24 +33,24 @@ final class NavElementMapper extends DataMapperAbstract * @since 1.0.0 */ protected static array $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_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_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'], ]; /**