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 1 Packages Projects Releases Wiki Activity

Revert the unnecessary optimization for asset->count()

Browse source
This commit is contained in:
Brady Wetherington 2022-01-13 19:37:08 -08:00
parent 4e8ae8a162
commit 65e584c2bd
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/Http/Controllers/ViewAssetsController.php
View file

@ -57,10 +57,10 @@ class ViewAssetsController extends Controller
*/ */
public function getRequestableIndex() public function getRequestableIndex()
{ {
$asset_count = Asset::with('model', 'defaultLoc', 'location', 'assignedTo', 'requests')->Hardware()->RequestableAssets()->count(); $assets = Asset::with('model', 'defaultLoc', 'location', 'assignedTo', 'requests')->Hardware()->RequestableAssets();
$models = AssetModel::with('category', 'requests', 'assets')->RequestableModels()->get(); $models = AssetModel::with('category', 'requests', 'assets')->RequestableModels()->get();
return view('account/requestable-assets', compact('asset_count', 'models')); return view('account/requestable-assets', compact('assets', 'models'));
} }
public function getRequestItem(Request $request, $itemType, $itemId = null) public function getRequestItem(Request $request, $itemType, $itemId = null)

2
resources/views/account/requestable-assets.blade.php
View file

@ -20,7 +20,7 @@
<ul class="nav nav-tabs"> <ul class="nav nav-tabs">
<li class="active"> <li class="active">
<a href="#assets" data-toggle="tab" title="{{ trans('general.assets') }}">{{ trans('general.assets') }} <a href="#assets" data-toggle="tab" title="{{ trans('general.assets') }}">{{ trans('general.assets') }}
<badge class="badge badge-secondary"> {{ $asset_count }}</badge> <badge class="badge badge-secondary"> {{ $assets->count()}}</badge>
</a> </a>
</li> </li>
<li> <li>