diff --git a/skolehjem/app/Http/Controllers/MenuPlanController.php b/skolehjem/app/Http/Controllers/MenuPlanController.php index 9a7944a..d737725 100644 --- a/skolehjem/app/Http/Controllers/MenuPlanController.php +++ b/skolehjem/app/Http/Controllers/MenuPlanController.php @@ -89,7 +89,7 @@ class MenuPlanController extends Controller public function update(Request $request, $id) { $data = $request->all(); - + //FORCED UPDATE $menuplan = MenuPlan::find($id); $menuplan->update($data); diff --git a/skolehjem/app/Http/Controllers/UserController.php b/skolehjem/app/Http/Controllers/UserController.php index 9016f0f..5880e1d 100644 --- a/skolehjem/app/Http/Controllers/UserController.php +++ b/skolehjem/app/Http/Controllers/UserController.php @@ -117,35 +117,42 @@ class UserController extends Controller */ public function update(Request $request, $id) { - $data = $request->validate([ - "name_first" => "max:255", - "name_last" => "max:255", - "email" => "email|unique:users", - "password" => "max:60", - "phone" => "unique:users", - ]); + $data = $request->all(); + +// $data = $request->validate([ +// "name_first" => "max:255", +// "name_last" => "max:255", +// "email" => "email|unique:users", +// "password" => "max:60", +// "phone" => "unique:users", +// ]); // Validates if the user is updating itself or another user. - if($id === Auth::id()) { - $user = Auth::user(); - - $user->update($data); - - $user->save(); - } - - //TODO: Implement when security's ready!!! -// else if(Auth::user()->hasPermissionTo("user.edit")) { -// $user = User::find($id); +// if($id === Auth::id()) { +// $user = Auth::user(); // -// /** @var User $user */ // $user->update($data); // // $user->save(); +// return Response::detect("users.edit", [ +// "user" => $user +// ]); // } - return Response::detect("users.edit", [ - "user" => $user + //TODO: Implement when security's ready!!! +// else if(Auth::user()->hasPermissionTo("user.edit")) { + $user = User::find($id); + + /** @var User $user */ + $user->update($data); + + $user->save(); +// } + + $users = User::query()->paginate(20); + + return Response::detect("users.index", [ + "users" => $users ]); } @@ -157,17 +164,17 @@ class UserController extends Controller */ public function destroy($id) { - if($id === Auth::id()) { - $user = Auth::user(); - $user->delete(); - } - else if(Auth::user()->hasPermissionTo("user.delete")) { +// if($id === Auth::id()) { +// $user = Auth::user(); +// $user->delete(); +// } +// else if(Auth::user()->hasPermissionTo("user.delete")) { $user = User::find($id); $user->delete(); - } +// } - return view("users.delete"); + return redirect()->route("users.index"); } /*******************************************/ diff --git a/skolehjem/resources/views/admin/users/edit.blade.php b/skolehjem/resources/views/admin/users/edit.blade.php index d9c1206..8cbe6ad 100644 --- a/skolehjem/resources/views/admin/users/edit.blade.php +++ b/skolehjem/resources/views/admin/users/edit.blade.php @@ -6,12 +6,12 @@ @endsection @section("path") - Rediger Bruger / + Rediger Bruger / @endsection @section("content")

Rediger Bruger:

-
$user]) }}"> + $user]) }}"> @csrf @method("put") diff --git a/skolehjem/resources/views/admin/users/index.blade.php b/skolehjem/resources/views/admin/users/index.blade.php index f2de90f..00448d7 100644 --- a/skolehjem/resources/views/admin/users/index.blade.php +++ b/skolehjem/resources/views/admin/users/index.blade.php @@ -26,7 +26,14 @@ {{ $user->email }} {{ $user->phone }} $user->id ]) }}">Update - Delete + + $user ]) }}" class="w-100"> + @csrf + @method("delete") + + +
+ @endforeach