lunax/snipe_it
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Merge pull request #12038 from snipe/fixes/clear_expected_checkin_on_checkin_action

Browse source 
Added - set `expected_checkin` to `null` on user bulk checkin and delete
This commit is contained in:
snipe 2022-10-26 00:56:43 -07:00 • committed by GitHub
commit b7efb58733
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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')), 'status_id' => e(request('status_id')),
'assigned_to' => null, 'assigned_to' => null,
'assigned_type' => null, 'assigned_type' => null,
'expected_checkin' => null,
]); ]);
@ -234,10 +235,10 @@ 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;
} }
$logAction->item_id = $item_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. // 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; $logAction->item_type = $itemType;