From ad1189f6c3c477fca805c91fef4250ae1f723a4d Mon Sep 17 00:00:00 2001
From: Praesidiarius <n.kammermann@swiss-crypto-mining.com>
Date: Thu, 23 Jan 2020 08:52:24 +0100
Subject: [PATCH] installer fixes

---
 data/data.sql      | 1 +
 data/structure.sql | 4 ++--
 src/Model/User.php | 2 +-
 src/Module.php     | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/data/data.sql b/data/data.sql
index 939fb31..332e459 100644
--- 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
index b6bfa7c..56c428a 100644
--- 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
index 18f32f8..4ab902e 100644
--- 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
index 911ddf8..881a36b 100644
--- 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';