Loading app/Http/Controllers/UserController.php +21 −4 Original line number Diff line number Diff line Loading @@ -3,6 +3,7 @@ namespace App\Http\Controllers; use App\Http\Requests\StoreUserRequest; use App\Http\Requests\UpdateRequestUser; use App\Models\Dependencia; use App\Models\User; use Illuminate\Http\Request; Loading @@ -27,7 +28,7 @@ public function create() { $dependencias = Dependencia::get(); $roles = Role::get(); return view('adminGen.usuarios.create', ['dependencias' => $dependencias, 'roles' => $roles]); return view('adminGen.usuarios.create', compact('dependencias', 'roles')); } /** Loading Loading @@ -64,15 +65,31 @@ public function show(string $id) */ public function edit(string $id) { // $user = User::findOrFail($id); $dependencias = Dependencia::all(); $roles = Role::all(); return view('adminGen.usuarios.edit', compact('user', 'dependencias', 'roles')); } /** * Update the specified resource in storage. */ public function update(Request $request, string $id) public function update(UpdateRequestUser $request, string $id) { // $request->validated(); $user = User::findOrFail($id); $user->name = $request->name; $user->username = $request->username; if ($request->filled('password')) { $user->password = Hash::make($request->password); } $user->dependencia_id = $request->dependencia_id; $user->assignRole($request->role); $user->active = $request->has('active'); $user->save(); return redirect()->route('usuarios.get')->with('success', 'Usuario actualizado correctamente.'); } /** Loading Loading
app/Http/Controllers/UserController.php +21 −4 Original line number Diff line number Diff line Loading @@ -3,6 +3,7 @@ namespace App\Http\Controllers; use App\Http\Requests\StoreUserRequest; use App\Http\Requests\UpdateRequestUser; use App\Models\Dependencia; use App\Models\User; use Illuminate\Http\Request; Loading @@ -27,7 +28,7 @@ public function create() { $dependencias = Dependencia::get(); $roles = Role::get(); return view('adminGen.usuarios.create', ['dependencias' => $dependencias, 'roles' => $roles]); return view('adminGen.usuarios.create', compact('dependencias', 'roles')); } /** Loading Loading @@ -64,15 +65,31 @@ public function show(string $id) */ public function edit(string $id) { // $user = User::findOrFail($id); $dependencias = Dependencia::all(); $roles = Role::all(); return view('adminGen.usuarios.edit', compact('user', 'dependencias', 'roles')); } /** * Update the specified resource in storage. */ public function update(Request $request, string $id) public function update(UpdateRequestUser $request, string $id) { // $request->validated(); $user = User::findOrFail($id); $user->name = $request->name; $user->username = $request->username; if ($request->filled('password')) { $user->password = Hash::make($request->password); } $user->dependencia_id = $request->dependencia_id; $user->assignRole($request->role); $user->active = $request->has('active'); $user->save(); return redirect()->route('usuarios.get')->with('success', 'Usuario actualizado correctamente.'); } /** Loading