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

Merge remote-tracking branch 'origin/master' into develop

Browse source
This commit is contained in:
snipe 2021-04-20 14:44:01 -07:00
parent 415ae5854f e8adf8d44c
commit e4acf8d795
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -221,7 +221,7 @@ View Assets for {{ $user->present()->fullName() }}
@foreach ($user->consumables as $consumable) @foreach ($user->consumables as $consumable)
<tr> <tr>
<td>{{ $consumable->name }}</td> <td>{{ $consumable->name }}</td>
<td>{{ $consumable->category->name }}</td> <td>{{ (($consumable->category) ? $consumable->category->name : 'deleted category') }}</td>
</tr> </tr>
@endforeach @endforeach
</tbody> </tbody>