Move the superuser flag out of permissions array - fixes #1503
This commit is contained in:
parent
6ebe187db1
commit
2ced2f8c73
|
|
@ -95,7 +95,7 @@ class Users extends Controller
|
|||
}
|
||||
|
||||
if (!$this->user->isSuperUser()) {
|
||||
$form->removeField('permissions[superuser]');
|
||||
$form->removeField('is_superuser');
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -150,7 +150,7 @@ class Users extends Controller
|
|||
],
|
||||
'trigger' => [
|
||||
'action' => 'disable',
|
||||
'field' => 'permissions[superuser]',
|
||||
'field' => 'is_superuser',
|
||||
'condition' => 'checked'
|
||||
],
|
||||
'span' => 'auto',
|
||||
|
|
|
|||
|
|
@ -0,0 +1,29 @@
|
|||
<?php
|
||||
|
||||
use Illuminate\Database\Schema\Blueprint;
|
||||
use Illuminate\Database\Migrations\Migration;
|
||||
use Backend\Models\User as AdminModel;
|
||||
|
||||
class DbBackendAddSuperuserFlag extends Migration
|
||||
{
|
||||
public function up()
|
||||
{
|
||||
Schema::table('backend_users', function (Blueprint $table) {
|
||||
$table->boolean('is_superuser')->default(false);
|
||||
});
|
||||
|
||||
AdminModel::all()->each(function($user) {
|
||||
if ($user->isSuperUser()) {
|
||||
$user->is_superuser = true;
|
||||
$user->save();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
public function down()
|
||||
{
|
||||
// Schema::table('backend_users', function (Blueprint $table) {
|
||||
// $table->dropColumn('is_superuser');
|
||||
// });
|
||||
}
|
||||
}
|
||||
|
|
@ -39,7 +39,8 @@ class SeedSetupAdmin extends Seeder
|
|||
'password_confirmation' => static::$password,
|
||||
'first_name' => static::$firstName,
|
||||
'last_name' => static::$lastName,
|
||||
'permissions' => ['superuser' => 1],
|
||||
'permissions' => [],
|
||||
'is_super_user' => true,
|
||||
'is_activated' => true
|
||||
]);
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
# ===================================
|
||||
|
||||
fields:
|
||||
permissions[superuser]:
|
||||
is_superuser:
|
||||
context: [create, update]
|
||||
tab: backend::lang.user.permissions
|
||||
label: backend::lang.user.superuser
|
||||
|
|
|
|||
Loading…
Reference in New Issue