diff --git a/app/Http/Controllers/Admin/RoleController.php b/app/Http/Controllers/Admin/RoleController.php index 80b05c6..d380287 100644 --- a/app/Http/Controllers/Admin/RoleController.php +++ b/app/Http/Controllers/Admin/RoleController.php @@ -14,9 +14,9 @@ /** * Roles del sistema - * + * * @author Moisés Cortés C. - * + * * @version 1.0.0 */ class RoleController extends Controller @@ -26,7 +26,8 @@ class RoleController extends Controller */ public function index() { - $model = Role::orderBy('description'); + $model = Role::where('name', '!=','developer')->orderBy('description'); + QuerySupport::queryByKey($model, request(), 'name'); diff --git a/app/Http/Controllers/Admin/UserController.php b/app/Http/Controllers/Admin/UserController.php index c95d8b0..b0335bd 100644 --- a/app/Http/Controllers/Admin/UserController.php +++ b/app/Http/Controllers/Admin/UserController.php @@ -15,11 +15,11 @@ /** * Controlador de usuarios - * + * * Permite la administración de los usuarios en general. - * + * * @author Moisés Cortés C - * + * * @version 1.0.0 */ class UserController extends Controller @@ -29,7 +29,9 @@ class UserController extends Controller */ public function index() { - $users = User::orderBy('name'); + $users = User::whereDoesntHave('roles', function ($query) { + $query->where('name', 'developer'); + })->orderBy('name'); QuerySupport::queryByKeys($users, ['name', 'email']); @@ -152,7 +154,7 @@ public function activity(UserActivityRequest $request, User $user) } return ApiResponse::OK->response([ - 'models' => + 'models' => $model->orderBy('created_at', 'desc') ->paginate(config('app.pagination')) ]); diff --git a/database/seeders/UserSeeder.php b/database/seeders/UserSeeder.php index d6716c5..34786e1 100644 --- a/database/seeders/UserSeeder.php +++ b/database/seeders/UserSeeder.php @@ -9,9 +9,9 @@ /** * Usuarios predeterminados del sistema - * + * * @author Moisés Cortés C. - * + * * @version 1.0.0 */ class UserSeeder extends Seeder @@ -21,34 +21,24 @@ class UserSeeder extends Seeder */ public function run(): void { - $developer = UserSecureSupport::create('developer@notsoweb.com'); + $developer = UserSecureSupport::create('developer@golsystems.com'); User::create([ 'name' => 'Developer', - 'paternal' => 'Notsoweb', - 'maternal' => 'Software', + 'paternal' => 'Golsystems', + 'maternal' => 'SA', 'email' => $developer->email, 'password' => $developer->hash, ])->assignRole(__('developer')); - $admin = UserSecureSupport::create('admin@notsoweb.com'); + $admin = UserSecureSupport::create('admin@golsystems.com'); User::create([ 'name' => 'Admin', - 'paternal' => 'Notsoweb', - 'maternal' => 'Software', + 'paternal' => 'Golsystems', + 'maternal' => 'SA', 'email' => $admin->email, 'password' => $admin->hash, ])->assignRole(__('admin')); - - $demo = UserSecureSupport::create('demo@notsoweb.com'); - - User::create([ - 'name' => 'Demo', - 'paternal' => 'Notsoweb', - 'maternal' => 'Software', - 'email' => $demo->email, - 'password' => $demo->hash, - ]); } }