Merge pull request #46 from UC-LeuvenLimburg/task/Delete_button

Task/delete button

Author: Joren-Thijs

app/Http/Controllers/UserController.php

@@ -10,14 +10,12 @@
 class UserController extends Controller
 {
     private $userRepo;
-    private $current_user;
 
     public function __construct(IUserRepository $userRepo)
     {
         $this->authorizeResource(User::class, 'user');
 
         $this->userRepo = $userRepo;
-        $this->current_user = Auth::user();
     }
 
     /**
@@ -61,7 +59,7 @@ public function store(Request $request)
      */
     public function show(User $user)
     {
-        return view('user.show')->with('user', $user)->with('current_user', $this->current_user);
+        return view('user.show')->with('user', $user);
     }
 
     /**

resources/views/user/edit.blade.php

@@ -30,7 +30,7 @@
             {!! Form::close() !!}
             <div class="parkit-delete-button">
                 {!! Form::open(['action' => ['UserController@destroy', $user], 'method' => 'POST']) !!}
-                @if (Auth::user()->role==="admin" && $user->name!=="admin")
+                @if (Auth::user()->role==="admin" && $user->name!=="admin" && $user!==Auth::User())
                 {{ Form::hidden('_method', 'DELETE') }}
                 {{ Form::submit('Delete', ['class' => 'btn btn-danger']) }}
                 {!! Form::close() !!}