DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-02-02 08:21:09 -08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #14164 from marcusmoore/bug/sc-20686

Browse source 
Avoid unnecessarily hydrating models on asset show page
This commit is contained in:
snipe 2024-01-25 00:20:30 +00:00 committed by GitHub
parent 57a8630e99 f5dafc477a
commit 45b253a57d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Http/Controllers/AssetModelsController.php
View file

@ -288,7 +288,7 @@ class AssetModelsController extends Controller
public function show($modelId = null) public function show($modelId = null)
{ {
$this->authorize('view', AssetModel::class); $this->authorize('view', AssetModel::class);
$model = AssetModel::withTrashed()->find($modelId); $model = AssetModel::withTrashed()->withCount('assets')->find($modelId);
if (isset($model->id)) { if (isset($model->id)) {
return view('models/view', compact('model')); return view('models/view', compact('model'));

4
resources/views/models/view.blade.php
View file

@ -43,7 +43,7 @@
</span> </span>
<span class="hidden-xs hidden-sm"> <span class="hidden-xs hidden-sm">
{{ trans('general.assets') }} {{ trans('general.assets') }}
{!! (($model->assets) && ($model->assets->count() > 0 )) ? '<badge class="badge badge-secondary">'.number_format($model->assets->count()).'</badge>' : '' !!} {!! (($model->assets_count) && ($model->assets_count > 0 )) ? '<badge class="badge badge-secondary">'.number_format($model->assets_count).'</badge>' : '' !!}
</span> </span>
</a> </a>
</li> </li>
@ -342,7 +342,7 @@
@endcan @endcan
@can('delete', \App\Models\AssetModel::class) @can('delete', \App\Models\AssetModel::class)
@if ($model->assets->count() > 0) @if ($model->assets_count > 0)
<div class="col-md-12" style="padding-bottom: 5px;"> <div class="col-md-12" style="padding-bottom: 5px;">
<button class="btn btn-block btn-sm btn-danger hidden-print disabled" data-tooltip="true" data-placement="top" data-title="{{ trans('general.cannot_be_deleted') }}">{{ trans('general.delete') }}</button> <button class="btn btn-block btn-sm btn-danger hidden-print disabled" data-tooltip="true" data-placement="top" data-title="{{ trans('general.cannot_be_deleted') }}">{{ trans('general.delete') }}</button>