mirror/snipe-it
3
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2026-03-07 00:48:58 +00:00
Code Issues Projects Releases Wiki Activity

Added inheritance back into users/groups

Browse Source
This commit is contained in:
snipe
2016-06-15 20:45:45 -07:00
parent 464ecc7cc6
commit 6a277a5391
5 changed files with 40 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/Http/Controllers/UsersController.php
View File

@ -278,7 +278,6 @@ class UsersController extends Controller
return redirect()->route('users')->with('error', $error);
}
$user_groups = array ($request->input('groups'));
// Update the user
$user->first_name = e($request->input('first_name'));
$user->last_name = e($request->input('last_name'));
@ -297,11 +296,8 @@ class UsersController extends Controller
$user->manager_id = e($request->input('manager_id'));
$user->notes = e($request->input('notes'));
$user->permissions = json_encode($request->input('permission'));
if ($request->has('groups')) {
$user->groups()->sync($request->input('groups'));
} else {
$user->groups()->sync(array());
}
if ($user->manager_id == "") {
@ -312,6 +308,12 @@ class UsersController extends Controller
$user->location_id = null;
}
if ($request->has('groups')) {
$user->groups()->sync($request->input('groups'));
} else {
$user->groups()->sync(array());
}
// Do we want to update the user password?
if (($request->has('password')) && (!config('app.lock_passwords'))) {
@ -330,6 +332,8 @@ class UsersController extends Controller
// Was the user updated?
if ($user->save()) {
// Prepare the success message
$success = trans('admin/users/message.success.update');