diff --git a/skolehjem/app/Http/Controllers/UserController.php b/skolehjem/app/Http/Controllers/UserController.php index 3687f33..d08c9ab 100644 --- a/skolehjem/app/Http/Controllers/UserController.php +++ b/skolehjem/app/Http/Controllers/UserController.php @@ -152,6 +152,13 @@ class UserController extends Controller /** @var User $user */ $user->update($data); + $user->roles()->detach(); + $user->forgetCachedPermissions(); + + foreach ($request->roles as $role){ + $user->assignRole($role); + } + $user->save(); // } diff --git a/skolehjem/resources/views/admin/users/create.blade.php b/skolehjem/resources/views/admin/users/create.blade.php index 6cc39a2..0802da9 100644 --- a/skolehjem/resources/views/admin/users/create.blade.php +++ b/skolehjem/resources/views/admin/users/create.blade.php @@ -25,9 +25,9 @@ - - + @foreach($roles as $role) @endforeach diff --git a/skolehjem/resources/views/admin/users/edit.blade.php b/skolehjem/resources/views/admin/users/edit.blade.php index f369a60..7025b63 100644 --- a/skolehjem/resources/views/admin/users/edit.blade.php +++ b/skolehjem/resources/views/admin/users/edit.blade.php @@ -27,8 +27,8 @@ - + @foreach($roles as $role) @endforeach diff --git a/skolehjem/resources/views/admin/users/index.blade.php b/skolehjem/resources/views/admin/users/index.blade.php index d40a09c..2a2c2b2 100644 --- a/skolehjem/resources/views/admin/users/index.blade.php +++ b/skolehjem/resources/views/admin/users/index.blade.php @@ -16,7 +16,7 @@ Efternavn Email Tlf nr - Rolle + Rolle(r) Update Delete @@ -26,7 +26,15 @@ {{ $user->name_last }} {{ $user->email }} {{ $user->phone }} - {{ $user->roles }} + + @for($i = 0; $i < count($user->roles); $i++) + @if(count($user->roles)-1 != $i) + {{$user->roles[$i]->name}}, + @else + {{$user->roles[$i]->name}} + @endif + @endfor + $user->id ]) }}">Update
$user ]) }}" class="w-100 nostyle"> @csrf