mirror of
https://github.com/snipe/snipe-it.git
synced 2025-01-26 13:10:55 -08:00
Merge pull request #8373 from snipe/tweak_v5_ldap_migration
Tweak v5 ldap migration for backwards-compatibility with working pre-v5 Active Directory setups
This commit is contained in:
commit
9f5669e70a
|
@ -3,6 +3,7 @@
|
|||
use Illuminate\Database\Migrations\Migration;
|
||||
use Illuminate\Database\Schema\Blueprint;
|
||||
use Illuminate\Support\Facades\Schema;
|
||||
use App\Models\Setting;
|
||||
|
||||
class AddAdAppendDomainSettings extends Migration
|
||||
{
|
||||
|
@ -16,7 +17,13 @@ class AddAdAppendDomainSettings extends Migration
|
|||
Schema::table('settings', function (Blueprint $table) {
|
||||
$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();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Reverse the migrations.
|
||||
|
|
Loading…
Reference in a new issue