From 98a894fd1eac2d0c6bd353fc14799a3827a31484 Mon Sep 17 00:00:00 2001 From: 1day2die Date: Mon, 8 May 2023 12:26:49 +0200 Subject: [PATCH 1/3] possible fix? --- database/settings/2023_02_04_181156_create_ticket_settings.php | 3 ++- database/settings/2023_05_07_195343_ticket_information.php | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/database/settings/2023_02_04_181156_create_ticket_settings.php b/database/settings/2023_02_04_181156_create_ticket_settings.php index 701ca14a..4637cbe3 100644 --- a/database/settings/2023_02_04_181156_create_ticket_settings.php +++ b/database/settings/2023_02_04_181156_create_ticket_settings.php @@ -10,7 +10,8 @@ class CreateTicketSettings extends SettingsMigration $table_exists = DB::table('settings_old')->exists(); // Get the user-set configuration values from the old table. - $this->migrator->add('ticket.enabled', $table_exists ? $this->getOldValue('SETTINGS::TICKET:ENABLED') : 'all'); + $this->migrator->add('ticket.enabled', $table_exists ? $this->getOldValue('SETTINGS::TICKET:ENABLED') : 'true'); + $this->migrator->add('ticket.notify', $table_exists ? $this->getOldValue('SETTINGS::TICKET:NOTIFY') : 'all'); } public function down(): void diff --git a/database/settings/2023_05_07_195343_ticket_information.php b/database/settings/2023_05_07_195343_ticket_information.php index a4d89f25..21d9aa67 100644 --- a/database/settings/2023_05_07_195343_ticket_information.php +++ b/database/settings/2023_05_07_195343_ticket_information.php @@ -6,6 +6,7 @@ return new class extends SettingsMigration { public function up(): void { + $this->migrator->delete('ticket.notify'); $this->migrator->add('ticket.information', "Can't start your server? Need an additional port? Do you have any other questions? Let us know by opening a ticket."); } }; From 78dfe881d28dc2c02529662e5b36d4700d8803ab Mon Sep 17 00:00:00 2001 From: 1day2die Date: Mon, 8 May 2023 12:35:52 +0200 Subject: [PATCH 2/3] Fix migration --- .../settings/2023_02_04_181156_create_ticket_settings.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/database/settings/2023_02_04_181156_create_ticket_settings.php b/database/settings/2023_02_04_181156_create_ticket_settings.php index 4637cbe3..1e71ad3a 100644 --- a/database/settings/2023_02_04_181156_create_ticket_settings.php +++ b/database/settings/2023_02_04_181156_create_ticket_settings.php @@ -58,11 +58,16 @@ class CreateTicketSettings extends SettingsMigration $old_value = DB::table('settings_old')->where('key', '=', $key)->get(['value', 'type'])->first(); // Handle the old values to return without it being a string in all cases. + + if (is_null($old_value)) { + return ''; + } if ($old_value->type === "string" || $old_value->type === "text") { if (is_null($old_value->value)) { return ''; } + // Some values have the type string, but their values are boolean. if ($old_value->value === "false" || $old_value->value === "true") { return filter_var($old_value->value, FILTER_VALIDATE_BOOL); From 29b5b39d1773a42010befad70141d3a2c16efa08 Mon Sep 17 00:00:00 2001 From: 1day2die Date: Mon, 8 May 2023 13:53:21 +0200 Subject: [PATCH 3/3] fix general settings --- app/Settings/GeneralSettings.php | 14 +++++++------- .../default/views/admin/settings/index.blade.php | 5 +++-- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/app/Settings/GeneralSettings.php b/app/Settings/GeneralSettings.php index 8aa91e22..06a4819e 100644 --- a/app/Settings/GeneralSettings.php +++ b/app/Settings/GeneralSettings.php @@ -8,13 +8,13 @@ class GeneralSettings extends Settings { public bool $store_enabled; public string $credits_display_name; - public bool $recaptcha_enabled; - public string $recaptcha_site_key; - public string $recaptcha_secret_key; - public string $phpmyadmin_url; - public bool $alert_enabled; + public ?bool $recaptcha_enabled; + public ?string $recaptcha_site_key; + public ?string $recaptcha_secret_key; + public ?string $phpmyadmin_url; + public ?bool $alert_enabled; public string $alert_type; - public string $alert_message; + public ?string $alert_message; public string $theme; //public int $initial_user_role; wait for Roles & Permissions PR. @@ -41,7 +41,7 @@ class GeneralSettings extends Settings 'phpmyadmin_url' => 'nullable|string', 'alert_enabled' => 'nullable|boolean', 'alert_type' => 'required|in:primary,secondary,success,danger,warning,info', - 'alert_message' => 'required|string', + 'alert_message' => 'nullable|string', 'theme' => 'required|in:default,BlueInfinity' // TODO: themes should be made/loaded dynamically ]; } diff --git a/themes/default/views/admin/settings/index.blade.php b/themes/default/views/admin/settings/index.blade.php index db4344b6..28615dbe 100644 --- a/themes/default/views/admin/settings/index.blade.php +++ b/themes/default/views/admin/settings/index.blade.php @@ -121,10 +121,11 @@ @case($value['type'] == 'select')