Merge remote-tracking branch 'origin/develop'

This commit is contained in:
snipe 2023-10-31 16:04:29 +00:00
commit 60088403b9

View file

@ -81,7 +81,7 @@
<td>{{ $asset->asset_tag }}</td>
<td>{{ $asset->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) ? $asset->model->name : trans('general.invalid_model') }}</td>
<td>{{ $asset->serial }}</td>
<td>
{{ $asset->last_checkout }}</td>