mirror of
https://github.com/snipe/snipe-it.git
synced 2025-03-05 20:52:15 -08:00
Fixed #8673 - added category to accessories listing on Account > Assigned Assets
This commit is contained in:
parent
ec14a117b7
commit
1cdf6f8263
|
@ -154,8 +154,9 @@ View Assets for {{ $user->present()->fullName() }}
|
||||||
}'>
|
}'>
|
||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<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('admin/hardware/form.serial') }}</th>
|
||||||
|
<th class="col-md-4">{{ trans('general.category') }}</th>
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
|
@ -169,6 +170,7 @@ View Assets for {{ $user->present()->fullName() }}
|
||||||
------------
|
------------
|
||||||
@endcan
|
@endcan
|
||||||
</td>
|
</td>
|
||||||
|
<td>{{ $license->category->name }}</td>
|
||||||
</tr>
|
</tr>
|
||||||
@endforeach
|
@endforeach
|
||||||
</tbody>
|
</tbody>
|
||||||
|
@ -211,13 +213,15 @@ View Assets for {{ $user->present()->fullName() }}
|
||||||
}'>
|
}'>
|
||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<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>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
@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>
|
||||||
</tr>
|
</tr>
|
||||||
@endforeach
|
@endforeach
|
||||||
</tbody>
|
</tbody>
|
||||||
|
@ -264,13 +268,15 @@ View Assets for {{ $user->present()->fullName() }}
|
||||||
}'>
|
}'>
|
||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<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>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
@foreach ($user->accessories as $accessory)
|
@foreach ($user->accessories as $accessory)
|
||||||
<tr>
|
<tr>
|
||||||
<td>{{ $accessory->name }}</td>
|
<td>{{ $accessory->name }}</td>
|
||||||
|
<td>{{ $accessory->category->name }}</td>
|
||||||
</tr>
|
</tr>
|
||||||
@endforeach
|
@endforeach
|
||||||
</tbody>
|
</tbody>
|
||||||
|
|
Loading…
Reference in a new issue