mirror of
https://github.com/snipe/snipe-it.git
synced 2025-01-12 06:17:28 -08:00
Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
e4acf8d795
|
@ -221,7 +221,7 @@ View Assets for {{ $user->present()->fullName() }}
|
|||
@foreach ($user->consumables as $consumable)
|
||||
<tr>
|
||||
<td>{{ $consumable->name }}</td>
|
||||
<td>{{ $consumable->category->name }}</td>
|
||||
<td>{{ (($consumable->category) ? $consumable->category->name : 'deleted category') }}</td>
|
||||
</tr>
|
||||
@endforeach
|
||||
</tbody>
|
||||
|
|
Loading…
Reference in a new issue