diff --git a/modules/backend/controllers/Users.php b/modules/backend/controllers/Users.php index 0caea82b7..206f4cb76 100644 --- a/modules/backend/controllers/Users.php +++ b/modules/backend/controllers/Users.php @@ -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', diff --git a/modules/backend/database/migrations/2015_10_01_000008_Db_Backend_Add_Superuser_Flag.php b/modules/backend/database/migrations/2015_10_01_000008_Db_Backend_Add_Superuser_Flag.php new file mode 100644 index 000000000..0e01c7e84 --- /dev/null +++ b/modules/backend/database/migrations/2015_10_01_000008_Db_Backend_Add_Superuser_Flag.php @@ -0,0 +1,29 @@ +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'); + // }); + } +} diff --git a/modules/backend/database/seeds/SeedSetupAdmin.php b/modules/backend/database/seeds/SeedSetupAdmin.php index d2401897c..ee60207e0 100644 --- a/modules/backend/database/seeds/SeedSetupAdmin.php +++ b/modules/backend/database/seeds/SeedSetupAdmin.php @@ -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 ]); diff --git a/modules/backend/models/user/fields.yaml b/modules/backend/models/user/fields.yaml index f963ab325..806bd5699 100644 --- a/modules/backend/models/user/fields.yaml +++ b/modules/backend/models/user/fields.yaml @@ -3,7 +3,7 @@ # =================================== fields: - permissions[superuser]: + is_superuser: context: [create, update] tab: backend::lang.user.permissions label: backend::lang.user.superuser