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

Merge pull request #10913 from inietov/fixes/bulk_user_edit_not_updating_asset_locations

Browse source 
Fixes Bulk user edit not updating checked out asset locations
This commit is contained in:
snipe 2022-04-07 19:41:01 +01:00 committed by GitHub
parent 6c1bb89776 6529a75683
commit 7b891f0952
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -109,12 +109,15 @@ class BulkUsersController extends Controller
if (!$manager_conflict) { if (!$manager_conflict) {
$this->conditionallyAddItem('manager_id'); $this->conditionallyAddItem('manager_id');
} }
// Save the updated info // Save the updated info
User::whereIn('id', $user_raw_array) User::whereIn('id', $user_raw_array)
->where('id', '!=', Auth::id())->update($this->update_array); ->where('id', '!=', Auth::id())->update($this->update_array);
if(array_key_exists('location_id', $this->update_array)){
Asset::where('assigned_type', User::class)
->whereIn('assigned_to', $user_raw_array)
->update(['location_id' => $this->update_array['location_id']]);
}
// Only sync groups if groups were selected // Only sync groups if groups were selected
if ($request->filled('groups')) { if ($request->filled('groups')) {
foreach ($users as $user) { foreach ($users as $user) {