Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp

skolehjem/app/Http/Controllers/UserController.php

@@ -154,6 +154,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();
 //        }
 
@@ -231,5 +238,13 @@ class UserController extends Controller
         return redirect()->route('users.login');
     }
 
+    public function account()
+    {
+        return Response::detect("users.account");
+    }
 
+    public function accountedit()
+    {
+        return Response::detect("users.edit");
+    }
 }

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"
     ];
 
     /**