mirror of
https://github.com/snipe/snipe-it.git
synced 2024-12-28 23:19:42 -08:00
Merge remote-tracking branch 'origin/develop'
This commit is contained in:
commit
de856d6045
|
@ -197,6 +197,7 @@ class BulkUsersController extends Controller
|
||||||
'status_id' => e(request('status_id')),
|
'status_id' => e(request('status_id')),
|
||||||
'assigned_to' => null,
|
'assigned_to' => null,
|
||||||
'assigned_type' => null,
|
'assigned_type' => null,
|
||||||
|
'expected_checkin' => null,
|
||||||
]);
|
]);
|
||||||
|
|
||||||
|
|
||||||
|
@ -234,7 +235,7 @@ class BulkUsersController extends Controller
|
||||||
$item_id = $item->id;
|
$item_id = $item->id;
|
||||||
$logAction = new Actionlog();
|
$logAction = new Actionlog();
|
||||||
|
|
||||||
if($itemType == License::class){
|
if ($itemType == License::class){
|
||||||
$item_id = $item->license_id;
|
$item_id = $item->license_id;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue