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

Merge pull request #14474 from Godmartinz/asset-location-update-bug

Browse source 
Fixed user assets not updating when a user changes location
This commit is contained in:
snipe 2024-05-15 19:20:14 +01:00 committed by GitHub
parent eb09a99eb0 5272824d85
commit 55281313d8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Http/Controllers/Assets/AssetCheckoutController.php
View file

@ -62,7 +62,7 @@ class AssetCheckoutController extends Controller
$this->authorize('checkout', $asset); $this->authorize('checkout', $asset);
$admin = Auth::user(); $admin = Auth::user();
$target = $this->determineCheckoutTarget($asset); $target = $this->determineCheckoutTarget();
$asset = $this->updateAssetLocation($asset, $target); $asset = $this->updateAssetLocation($asset, $target);

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

@ -293,8 +293,15 @@ class UsersController extends Controller
$user->password = bcrypt($request->input('password')); $user->password = bcrypt($request->input('password'));
} }
// Update the location of any assets checked out to this user
Asset::where('assigned_type', User::class)
->where('assigned_to', $user->id)
->update(['location_id' => $user->location_id]);
$permissions_array = $request->input('permission'); $permissions_array = $request->input('permission');
// Strip out the superuser permission if the user isn't a superadmin // Strip out the superuser permission if the user isn't a superadmin
if (! Auth::user()->isSuperUser()) { if (! Auth::user()->isSuperUser()) {
unset($permissions_array['superuser']); unset($permissions_array['superuser']);