installer fixes

OnePlc · Jan 23, 2020 · ad1189f · ad1189f
1 parent 8368360
commit ad1189f
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/data/data.sql b/data/data.sql
@@ -49,6 +49,7 @@ INSERT INTO `permission` (`permission_key`, `module`, `label`, `nav_label`, `nav
 ('edit', 'OnePlace\\User\\Controller\\UserController', 'Edit', '', '', 0),
 ('index', 'OnePlace\\User\\Controller\\UserController', 'Index', 'Users', '/user', 1),
 ('updateindexcolumnsort', 'OnePlace\\User\\Controller\\UserController', 'Update Column Index', '', '', 0),
+('settheme', 'OnePlace\\User\\Controller\\UserController', 'Set own Theme', '', '', 0),
 ('view', 'OnePlace\\User\\Controller\\UserController', 'View', '', '', 0);
 
 --

diff --git a/data/structure.sql b/data/structure.sql
@@ -5,8 +5,8 @@ CREATE TABLE `permission` (
   `permission_key` varchar(100) COLLATE utf8mb4_unicode_ci NOT NULL,
   `module` varchar(100) COLLATE utf8mb4_unicode_ci NOT NULL,
   `label` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL,
-  `nav_label` varchar(100) COLLATE utf8mb4_unicode_ci NOT NULL,
-  `nav_href` varchar(100) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `nav_label` varchar(100) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
+  `nav_href` varchar(100) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
   `show_in_menu` tinyint(1) NOT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 

diff --git a/src/Model/User.php b/src/Model/User.php
@@ -234,7 +234,7 @@ public function getTheme() {
     public function updatePermissions(array $aPermissions) {
         $aMyPermsDB = CoreEntityModel::$aEntityTables['user-permission']->delete(['user_idfs'=>$this->getID()]);
 
-        $aBasePermissions = ['index-Application-Controller-IndexController'];
+        $aBasePermissions = [];
         $aPermissions = array_merge($aBasePermissions,$aPermissions);
 
         foreach($aPermissions as $sPermWithModule) {

diff --git a/src/Module.php b/src/Module.php
@@ -158,7 +158,7 @@ function($e) {
                     /**
                      * Setup before First Login
                      */
-                    if(!file_exists($_SERVER['DOCUMENT_ROOT'].'/../config/autoload/local.php')) {
+                    if(!file_exists($_SERVER['DOCUMENT_ROOT'].'/../config/autoload/local.php') && $sRouteName != 'setup') {
                         echo $sRouteName;
                         echo 'no config yet';