bugfix: updating a user when an admin (not a superuser) would remove any groups from the user. (#5914)

2018-07-22 02:02:06 -04:00
parent e1c095adca
commit 82194cef8a
1 changed files with 4 additions and 5 deletions
@@ -247,9 +247,10 @@ class UsersController extends Controller
                }
            }

-        } catch (UserNotFoundException $e) {
-            $error = trans('admin/users/message.user_not_found', compact('id'));
-            return redirect()->route('users.index')->with('error', $error);
+
+        } catch (ModelNotFoundException $e) {
+            return redirect()->route('users.index')
+                ->with('error', trans('admin/users/message.user_not_found', compact('id')))
        }


@@ -257,8 +258,6 @@ class UsersController extends Controller
        if (Auth::user()->isSuperUser()) {
            if ($request->has('groups')) {
                $user->groups()->sync($request->input('groups'));
-            } else {
-                $user->groups()->sync(array());
            }
        }