mirror of
https://github.com/snipe/snipe-it.git
synced 2024-11-11 08:04:09 -08:00
Merge remote-tracking branch 'origin/develop'
This commit is contained in:
commit
96be0c25c4
|
@ -80,7 +80,7 @@
|
||||||
<td>{{ $counter }}</td>
|
<td>{{ $counter }}</td>
|
||||||
<td>{{ $asset->asset_tag }}</td>
|
<td>{{ $asset->asset_tag }}</td>
|
||||||
<td>{{ $asset->name }}</td>
|
<td>{{ $asset->name }}</td>
|
||||||
<td>{{ $asset->model->category->name }}</td>
|
<td>{{ (($asset->model) && ($asset->model->category)) ? $asset->model->category->name : trans('general.invalid_category') }}</td>
|
||||||
<td>{{ $asset->model->name }}</td>
|
<td>{{ $asset->model->name }}</td>
|
||||||
<td>{{ $asset->serial }}</td>
|
<td>{{ $asset->serial }}</td>
|
||||||
<td>
|
<td>
|
||||||
|
|
Loading…
Reference in a new issue