Merge remote-tracking branch 'origin/master'

skolehjem/app/Http/Controllers/UserController.php

@@ -178,6 +178,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();
 //        }
 

skolehjem/app/User.php

@@ -21,7 +21,7 @@ class User extends Authenticatable
      * @var array
      */
     protected $fillable = [
-        'name_first', "name_last", 'email', 'password', "phone", "roles"
+        'name_first', "name_last", 'email', 'password', "phone"
     ];
 
     /**