From fe3242a0958673d5923e4cbe95adaa5207251486 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Thu, 28 May 2020 18:54:13 +1000 Subject: [PATCH] Adjustments for setup page --- app/Http/Controllers/BaseController.php | 4 ++-- resources/views/setup/_database.blade.php | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/Http/Controllers/BaseController.php b/app/Http/Controllers/BaseController.php index 0b2293328edf..fe6e3f777c6a 100644 --- a/app/Http/Controllers/BaseController.php +++ b/app/Http/Controllers/BaseController.php @@ -319,10 +319,10 @@ class BaseController extends Controller // return redirect()->secure(request()->path()); // } - if ((bool)$this->checkAppSetup() !== false) { + if ((bool)$this->checkAppSetup() !== false && $account = Account::all()->first()) { $data = []; - if (Ninja::isSelfHost() && $account = Account::all()->first()) { + if (Ninja::isSelfHost()) { $data['report_errors'] = $account->report_errors; } else { $data['report_errors'] = true; diff --git a/resources/views/setup/_database.blade.php b/resources/views/setup/_database.blade.php index 159bd9295786..52c2e1f487d4 100644 --- a/resources/views/setup/_database.blade.php +++ b/resources/views/setup/_database.blade.php @@ -17,7 +17,7 @@ Show code
 -- Commands to create a MySQL database and user
-CREATE SCHEMA `ninja` DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci;
+CREATE SCHEMA `db-ninja-01` DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci;
 CREATE USER 'ninja'@'localhost' IDENTIFIED BY 'ninja';
 GRANT ALL PRIVILEGES ON `ninja`.* TO 'ninja'@'localhost';
 FLUSH PRIVILEGES;
@@ -38,7 +38,7 @@ FLUSH PRIVILEGES;
                     {{ ctrans('texts.host') }}*
                 
                 
- +
@@ -46,7 +46,7 @@ FLUSH PRIVILEGES; {{ ctrans('texts.database') }}*
- +
@@ -54,7 +54,7 @@ FLUSH PRIVILEGES; {{ ctrans('texts.username') }}*
- +
@@ -62,7 +62,7 @@ FLUSH PRIVILEGES; {{ ctrans('texts.password') }}
- +