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

Conflicts: skolehjem/public/css/admin.css
2020-07-27 08:25:42 +02:00
parent a755fd9680 6eb198011f
commit 79e5e95695
46 changed files with 7081 additions and 207 deletions
@@ -154,11 +154,13 @@ class UserController extends Controller
            /** @var User $user */
            $user->update($data);

-            $user->roles()->detach();
-            $user->forgetCachedPermissions();
+            if ($request->roles != null) {
+                $user->roles()->detach();
+                $user->forgetCachedPermissions();

-            foreach ($request->roles as $role){
-                $user->assignRole($role);
+                foreach ($request->roles as $role){
+                    $user->assignRole($role);
+                }
            }

            $user->save();
@@ -247,4 +249,9 @@ class UserController extends Controller
    {
        return Response::detect("users.edit");
    }
+
+    public function accounteditpass()
+    {
+        return Response::detect("users.editpass");
+    }
 }