DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-03-05 20:52:15 -08:00
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Fixed issue where we tried to call the audit log even if the asset wasn’t valid

Browse source
This commit is contained in:
snipe 2017-10-31 05:41:06 -07:00
parent 472a5b9f69
commit 32b2f77ad9
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
app/Http/Controllers/AssetsController.php
View file

@ -597,13 +597,15 @@ class AssetsController extends Controller
$asset = Asset::withTrashed()->find($assetId); $asset = Asset::withTrashed()->find($assetId);
$this->authorize('view', $asset); $this->authorize('view', $asset);
$settings = Setting::getSettings(); $settings = Setting::getSettings();
$audit_log = Actionlog::where('action_type', '=', 'audit')
->where('item_id', '=', $assetId)
->where('item_type', '=', Asset::class)
->orderBy('created_at', 'DESC')->first();
if (isset($asset)) { if (isset($asset)) {
$audit_log = Actionlog::where('action_type', '=', 'audit')
->where('item_id', '=', $assetId)
->where('item_type', '=', Asset::class)
->orderBy('created_at', 'DESC')->first();
if ($asset->location) { if ($asset->location) {
$use_currency = $asset->location->currency; $use_currency = $asset->location->currency;
} else { } else {
@ -1148,10 +1150,9 @@ class AssetsController extends Controller
{ {
$this->authorize('checkout', Asset::class); $this->authorize('checkout', Asset::class);
// Filter out assets that are not deployable. // Filter out assets that are not deployable.
$assets_list = Company::scopeCompanyables(Asset::RTD()->get(), 'assets.company_id')->pluck('detailed_name', 'id')->toArray();
return view('hardware/bulk-checkout') return view('hardware/bulk-checkout')
->with('users_list', Helper::usersList()) ->with('users_list', Helper::usersList());
->with('assets_list', $assets_list);
} }
public function postBulkCheckout(Request $request) public function postBulkCheckout(Request $request)