DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-25 05:34:06 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'

Browse source
This commit is contained in:
snipe 2020-11-09 23:05:40 -08:00
parent b8ad930690 1cdf6f8263
commit 8a7cd87644
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -154,8 +154,9 @@ View Assets for {{ $user->present()->fullName() }}
}'>
<thead>
<tr>
<th class="col-md-5">{{ trans('general.name') }}</th>
<th class="col-md-4">{{ trans('general.name') }}</th>
<th class="col-md-4">{{ trans('admin/hardware/form.serial') }}</th>
<th class="col-md-4">{{ trans('general.category') }}</th>
</tr>
</thead>
<tbody>
@ -169,6 +170,7 @@ View Assets for {{ $user->present()->fullName() }}
------------
@endcan
</td>
<td>{{ $license->category->name }}</td>
</tr>
@endforeach
</tbody>
@ -211,13 +213,15 @@ View Assets for {{ $user->present()->fullName() }}
}'>
<thead>
<tr>
<th class="col-md-12">{{ trans('general.name') }}</th>
<th class="col-md-8">{{ trans('general.name') }}</th>
<th class="col-md-4">{{ trans('general.category') }}</th>
</tr>
</thead>
<tbody>
@foreach ($user->consumables as $consumable)
<tr>
<td>{{ $consumable->name }}</td>
<td>{{ $consumable->category->name }}</td>
</tr>
@endforeach
</tbody>
@ -264,13 +268,15 @@ View Assets for {{ $user->present()->fullName() }}
}'>
<thead>
<tr>
<th class="col-md-12">Name</th>
<th class="col-md-8">{{ trans('general.name') }}</th>
<th class="col-md-4">{{ trans('general.category') }}</th>
</tr>
</thead>
<tbody>
@foreach ($user->accessories as $accessory)
<tr>
<td>{{ $accessory->name }}</td>
<td>{{ $accessory->category->name }}</td>
</tr>
@endforeach
</tbody>