Merge branch 'develop' into snipe-it-17051
This commit is contained in:
@@ -446,7 +446,7 @@ class AssetsController extends Controller
|
||||
event(new CheckoutableCheckedIn($asset, $target, auth()->user(), 'Checkin on delete', $checkin_at, $originalValues));
|
||||
DB::table('assets')
|
||||
->where('id', $asset->id)
|
||||
->update(['assigned_to' => null]);
|
||||
->update(['assigned_to' => null, 'assigned_type' => null]);
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -642,7 +642,6 @@ class BulkAssetsController extends Controller
|
||||
|
||||
// See if there is a status label passed
|
||||
if ($request->filled('status_id')) {
|
||||
\Log::error('status id: ' . $request->get('status_id'));
|
||||
$asset->status_id = $request->get('status_id');
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user