diff --git a/Database/Seeders/PermissionGroupSeeder.php b/Database/Seeders/PermissionGroupSeeder.php index cf8f1a0..05709fa 100644 --- a/Database/Seeders/PermissionGroupSeeder.php +++ b/Database/Seeders/PermissionGroupSeeder.php @@ -33,7 +33,7 @@ ['name' => 'master'], ['name' => 'document'], ['name' => 'setting'], - ['name' => 'Logs'] + ['name' => 'logs'] ]; } } diff --git a/Database/Seeders/PermissionsSeeder.php b/Database/Seeders/PermissionsSeeder.php index 08c3796..5cc6d93 100644 --- a/Database/Seeders/PermissionsSeeder.php +++ b/Database/Seeders/PermissionsSeeder.php @@ -49,7 +49,7 @@ ], [ 'permission_group_id' => $value['group'] ]); - if($role->name=='ao' && explode('.',$value['name'])[0]=='document'){ + if($role->name=='ad' && explode('.',$value['name'])[0]=='document'){ if($permission->name=='document.read'){ $role->givePermissionTo($permission); } @@ -64,23 +64,22 @@ public function data($role) { $data = []; + $model = []; // list of model permission - if($role == 'administrator'){ - $model = ['user', 'role', 'permission','system','master','document','setting','Logs']; + if ($role == 'administrator') { + $model = [['id' => 1, 'name' => 'user'], ['id' => 2, 'name' => 'role'], ['id' => 3, 'name' => 'permission'], ['id' => 4, 'name' => 'system'], ['id' => 5, 'name' => 'master'], ['id' => 6, 'name' => 'document'], ['id' => 7, 'name' => 'setting'], ['id' => 8, 'name' => 'logs']]; } elseif($role == 'ad'){ - $model = ['system','document','setting','Logs']; + $model = [['id' => 4, 'name' => 'system'], ['id' => 6, 'name' => 'document'], ['id' => 7, 'name' => 'setting'], ['id' => 8, 'name' => 'logs']]; } elseif($role == 'dd'){ - $model = ['system','master','document','setting']; + $model = [['id' => 4, 'name' => 'system'], ['id' => 5, 'name' => 'master'], ['id' => 6, 'name' => 'document'], ['id' => 7, 'name' => 'setting']]; } elseif($role == 'eo'){ - $model = ['document']; + $model = [['id' => 6, 'name' => 'document']]; } - $i = 1; foreach ($model as $value) { - foreach ($this->crudActions($value) as $action) { - $data[] = ['name' => $action, 'group' => $i]; + foreach ($this->crudActions($value['name']) as $action) { + $data[] = ['name' => $action, 'group' => $value['id']]; } - $i++; } return $data; diff --git a/Database/Seeders/UsersSeeder.php b/Database/Seeders/UsersSeeder.php index 4ef311a..9038298 100644 --- a/Database/Seeders/UsersSeeder.php +++ b/Database/Seeders/UsersSeeder.php @@ -17,9 +17,6 @@ */ public function run(Generator $faker) { - $roleAdmin = Role::find(1); - $roleUser = Role::find(2); - $roles = Role::all(); foreach ($roles as $role) { @@ -32,7 +29,7 @@ 'email_verified_at' => now(), ] ); - $admin->assignRole($roleAdmin); + $admin->assignRole($role); } if ($role->name == 'ad') { @@ -44,7 +41,7 @@ 'email_verified_at' => now(), ] ); - $admin->assignRole($roleAdmin); + $admin->assignRole($role); } if ($role->name == 'dd') { @@ -56,7 +53,7 @@ 'email_verified_at' => now(), ] ); - $admin->assignRole($roleAdmin); + $admin->assignRole($role); } if ($role->name == 'eo') { @@ -68,7 +65,7 @@ 'email_verified_at' => now(), ] ); - $admin->assignRole($roleAdmin); + $admin->assignRole($role); } } }