DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-01-12 14:27:33 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fixed 500 on wrong association

Browse source 
Signed-off-by: snipe <snipe@snipe.net>
This commit is contained in:
snipe 2021-09-24 12:54:47 -07:00
parent 5875cf1e9e
commit 20e23c1248
1 changed files with 8 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
resources/views/hardware/view.blade.php
View file

@ -134,18 +134,8 @@
<i class="fa fa-barcode fa-2x" aria-hidden="true"></i> <i class="fa fa-barcode fa-2x" aria-hidden="true"></i>
</span> </span>
<span class="hidden-xs hidden-sm">{{ trans('general.assets') }} <span class="hidden-xs hidden-sm">{{ trans('general.assets') }}
{!! ($asset->assets->count() > 0 ) ? '<badge class="badge badge-secondary">'.$asset->assets->count().'</badge>' : '' !!} {!! ($asset->assignedAssets()->count() > 0 ) ? '<badge class="badge badge-secondary">'.$asset->assignedAssets()->count().'</badge>' : '' !!}
</span>
</a>
</li>
<li>
<a href="#maintenances" data-toggle="tab">
<span class="hidden-lg hidden-md">
<i class="fa fa-wrench fa-2x" aria-hidden="true"></i>
</span>
<span class="hidden-xs hidden-sm">{{ trans('general.maintenances') }}
{!! ($asset->maintenances->count() > 0 ) ? '<badge class="badge badge-secondary">'.$asset->maintenances->count().'</badge>' : '' !!}
</span> </span>
</a> </a>
</li> </li>
@ -162,13 +152,13 @@
</li> </li>
<li> <li>
<a href="#files" data-toggle="tab"> <a href="#maintenances" data-toggle="tab">
<span class="hidden-lg hidden-md"> <span class="hidden-lg hidden-md">
<i class="fa fa-paperclip fa-2x" aria-hidden="true"></i> <i class="fa fa-wrench fa-2x" aria-hidden="true"></i>
</span> </span>
<span class="hidden-xs hidden-sm">{{ trans('general.maintenances') }} <span class="hidden-xs hidden-sm">{{ trans('general.maintenances') }}
{!! ($asset->uploads->count() > 0 ) ? '<badge class="badge badge-secondary">'.$asset->uploads->count().'</badge>' : '' !!} {!! ($asset->assetmaintenances()->count() > 0 ) ? '<badge class="badge badge-secondary">'.$asset->assetmaintenances()->count().'</badge>' : '' !!}
</span> </span>
</a> </a>
</li> </li>
@ -203,7 +193,7 @@
{{ $asset->assetstatus->name }} {{ $asset->assetstatus->name }}
<label class="label label-default">{{ trans('general.deployed') }}</label> <label class="label label-default">{{ trans('general.deployed') }}</label>
<i class="fa fa-long-arrow-right" aria-hidden="true"></i> <i class="fas fa-long-arrow-alt-right" aria-hidden="true"></i>
{!! $asset->assignedTo->present()->glyph() !!} {!! $asset->assignedTo->present()->glyph() !!}
{!! $asset->assignedTo->present()->nameUrl() !!} {!! $asset->assignedTo->present()->nameUrl() !!}
@else @else