DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-02-02 08:21:09 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #8373 from snipe/tweak_v5_ldap_migration

Browse source 
Tweak v5 ldap migration for backwards-compatibility with working pre-v5 Active Directory setups
This commit is contained in:
snipe 2020-08-26 13:34:25 -07:00 committed by GitHub
parent c23e28d0df 14da328dea
commit 9f5669e70a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
database/migrations/2020_02_04_172100_add_ad_append_domain_settings.php
View file

@ -3,6 +3,7 @@
use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint; use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema; use Illuminate\Support\Facades\Schema;
use App\Models\Setting;
class AddAdAppendDomainSettings extends Migration class AddAdAppendDomainSettings extends Migration
{ {
@ -16,6 +17,12 @@ class AddAdAppendDomainSettings extends Migration
Schema::table('settings', function (Blueprint $table) { Schema::table('settings', function (Blueprint $table) {
$table->boolean('ad_append_domain')->nullable(false)->default('0'); $table->boolean('ad_append_domain')->nullable(false)->default('0');
}); });
$s = Setting::first(); // we are deliberately *not* using the ::getSettings() method, as it caches things, and our Settings table is being migrated right now
if($s->is_ad && $s->ldap_enabled && $s->ad_domain) { //backwards-compatibility setting; < v5 always appended AD Domains
$s->ad_append_domain = 1;
$s->save();
}
} }
/** /**