DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-03-05 20:52:15 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #16409 from snipe/#16386_user_dropdown_fields_not_populating_on_edit

Browse source 
Fixed #16386 - some fields not populating with user data on edit
This commit is contained in:
snipe 2025-03-04 15:28:11 +00:00 committed by GitHub
parent 759e3794df a09a9d3cd6
commit e19003aea5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/Http/Controllers/Users/UsersController.php
View file

@ -198,10 +198,9 @@ class UsersController extends Controller
$userPermissions = Helper::selectedPermissionsArray($permissions, $user->permissions); $userPermissions = Helper::selectedPermissionsArray($permissions, $user->permissions);
$permissions = $this->filterDisplayable($permissions); $permissions = $this->filterDisplayable($permissions);
return view('users/edit', compact('user', 'groups', 'userGroups', 'permissions', 'userPermissions')); return view('users/edit', compact('user', 'groups', 'userGroups', 'permissions', 'userPermissions'))->with('item', $user);
} }
return redirect()->route('users.index')->with('error', trans('admin/users/message.user_not_found', compact('id')));
} }
/** /**
@ -456,10 +455,10 @@ class UsersController extends Controller
->with('user', $user) ->with('user', $user)
->with('groups', Group::pluck('name', 'id')) ->with('groups', Group::pluck('name', 'id'))
->with('userGroups', $userGroups) ->with('userGroups', $userGroups)
->with('clone_user', $user_to_clone); ->with('clone_user', $user_to_clone)
->with('item', $user);
} }
return redirect()->route('users.index')->with('error', trans('admin/users/message.user_not_found', compact('id')));
} }