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

Fixes #1997 - save user groups without Sentry crap

Browse source
This commit is contained in:
snipe 2016-05-12 15:26:48 -07:00
parent 6d91774943
commit 720274446e
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -65,16 +65,15 @@ class UsersController extends Controller
{ {
$user = new User; $user = new User;
// Selected groups $groups = Group::pluck('name', 'id');
if (Input::has('groups')) {
$userGroups = Group::pluck('name', 'id')->whereIn('id',Input::get('groups')); if (Input::old('groups')) {
$userGroups = Group::whereIn('id', Input::old('groups'))->pluck('name', 'id');
} else { } else {
$userGroups = collect(); $userGroups = collect();
} }
$permissions = config('permissions'); $permissions = config('permissions');
$groups = Group::pluck('name', 'id');
$userGroups = $user->groups()->pluck('name', 'id');
$userPermissions = Helper::selectedPermissionsArray($permissions, Input::old('permissions', array())); $userPermissions = Helper::selectedPermissionsArray($permissions, Input::old('permissions', array()));
$location_list = Helper::locationsList(); $location_list = Helper::locationsList();
@ -109,6 +108,7 @@ class UsersController extends Controller
$data['password'] = Input::get('password'); $data['password'] = Input::get('password');
if ($user->save()) { if ($user->save()) {
$user->groups()->sync(Input::get('groups'));
if ((Input::get('email_user') == 1) && (Input::has('email'))) { if ((Input::get('email_user') == 1) && (Input::has('email'))) {
// Send the credentials through email // Send the credentials through email
$data = array(); $data = array();
@ -269,6 +269,7 @@ class UsersController extends Controller
$user->manager_id = e(Input::get('manager_id')); $user->manager_id = e(Input::get('manager_id'));
$user->notes = e(Input::get('notes')); $user->notes = e(Input::get('notes'));
$user->permissions = json_encode(Input::get('permission')); $user->permissions = json_encode(Input::get('permission'));
$user->groups()->sync(Input::get('groups'));
if ($user->manager_id == "") { if ($user->manager_id == "") {
$user->manager_id = null; $user->manager_id = null;