From 2e228ccb0bd94c295493f3aeb5a9a13f83af149e Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Thu, 15 Dec 2022 10:45:42 -0800 Subject: [PATCH] redid a few things. should be good now :) --- ...2_08_25_213308_adds_ldap_default_group_to_settings_table.php | 2 +- resources/lang/en/admin/settings/general.php | 2 +- resources/views/settings/ldap.blade.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/database/migrations/2022_08_25_213308_adds_ldap_default_group_to_settings_table.php b/database/migrations/2022_08_25_213308_adds_ldap_default_group_to_settings_table.php index aa43683b0..25aca0eef 100644 --- a/database/migrations/2022_08_25_213308_adds_ldap_default_group_to_settings_table.php +++ b/database/migrations/2022_08_25_213308_adds_ldap_default_group_to_settings_table.php @@ -15,7 +15,7 @@ class AddsLdapDefaultGroupToSettingsTable extends Migration { Schema::table('settings', function (Blueprint $table) { $table->integer('ldap_default_group') - ->after('ldap_basedn'); + ->after('ldap_basedn')->default(null); }); } diff --git a/resources/lang/en/admin/settings/general.php b/resources/lang/en/admin/settings/general.php index 58f254a6e..701cf695f 100644 --- a/resources/lang/en/admin/settings/general.php +++ b/resources/lang/en/admin/settings/general.php @@ -76,7 +76,7 @@ return [ 'laravel' => 'Laravel Version', 'ldap' => 'LDAP', 'ldap_default_group' => 'Default Permissions Group', - 'ldap_default_group_info' => 'Select a group to assign to newly synced users, remember that a user takes on the permissions of the group they are assigned.', + 'ldap_default_group_info' => 'Select a group to assign to newly synced users. Remember that a user takes on the permissions of the group they are assigned.', 'ldap_help' => 'LDAP/Active Directory', 'ldap_client_tls_key' => 'LDAP Client TLS Key', 'ldap_client_tls_cert' => 'LDAP Client-Side TLS Certificate', diff --git a/resources/views/settings/ldap.blade.php b/resources/views/settings/ldap.blade.php index cae3ceae2..628ca41c5 100644 --- a/resources/views/settings/ldap.blade.php +++ b/resources/views/settings/ldap.blade.php @@ -118,7 +118,7 @@ id="ldap_default_group" class="form-control" > - + @foreach ($groups as $id => $group)