DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-24 21:24:13 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Daniel Meltzer 2018-07-22 02:02:06 -04:00 committed by snipe
parent e1c095adca
commit 82194cef8a
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/Http/Controllers/UsersController.php
View file

@ -247,9 +247,10 @@ class UsersController extends Controller
} }
} }
} catch (UserNotFoundException $e) {
$error = trans('admin/users/message.user_not_found', compact('id')); } catch (ModelNotFoundException $e) {
return redirect()->route('users.index')->with('error', $error); 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 (Auth::user()->isSuperUser()) {
if ($request->has('groups')) { if ($request->has('groups')) {
$user->groups()->sync($request->input('groups')); $user->groups()->sync($request->input('groups'));
} else {
$user->groups()->sync(array());
} }
} }