DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-27 14:39:49 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'

Browse source
This commit is contained in:
snipe 2022-10-26 00:57:17 -07:00
parent 88ae8858e8 b7efb58733
commit de856d6045
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -197,6 +197,7 @@ class BulkUsersController extends Controller
'status_id' => e(request('status_id')),
'assigned_to' => null,
'assigned_type' => null,
'expected_checkin' => null,
]);
@ -234,10 +235,10 @@ class BulkUsersController extends Controller
$item_id = $item->id;
$logAction = new Actionlog();
if($itemType == License::class){
if ($itemType == License::class){
$item_id = $item->license_id;
}
$logAction->item_id = $item_id;
// We can't rely on get_class here because the licenses/accessories fetched above are not eloquent models, but simply arrays.
$logAction->item_type = $itemType;