DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-15 10:04:13 -08:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'

Browse source
This commit is contained in:
snipe 2024-03-20 19:01:03 +00:00
parent 3391108551 d8378f2a10
commit 0f11963127
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
resources/views/users/print.blade.php
View file

@ -110,6 +110,7 @@
<th data-field="asset_name" data-sortable="true" data-visible="true">{{ trans('general.name') }}</th> <th data-field="asset_name" data-sortable="true" data-visible="true">{{ trans('general.name') }}</th>
<th data-field="asset_category" data-sortable="true" data-visible="true">{{ trans('general.category') }}</th> <th data-field="asset_category" data-sortable="true" data-visible="true">{{ trans('general.category') }}</th>
<th data-field="asset_model" data-sortable="true" data-visible="true">{{ trans('admin/hardware/form.model') }}</th> <th data-field="asset_model" data-sortable="true" data-visible="true">{{ trans('admin/hardware/form.model') }}</th>
<th data-field="rtd_location" data-sortable="true" data-visible="true">{{ trans('admin/hardware/form.default_location') }}</th>
<th data-field="asset_location" data-sortable="true" data-visible="false">{{ trans('general.location') }}</th> <th data-field="asset_location" data-sortable="true" data-visible="false">{{ trans('general.location') }}</th>
<th data-field="asset_serial" data-sortable="true" data-visible="true">{{ trans('admin/hardware/form.serial') }}</th> <th data-field="asset_serial" data-sortable="true" data-visible="true">{{ trans('admin/hardware/form.serial') }}</th>
<th data-field="asset_checkout_date" data-sortable="true" data-visible="true">{{ trans('admin/hardware/table.checkout_date') }}</th> <th data-field="asset_checkout_date" data-sortable="true" data-visible="true">{{ trans('admin/hardware/table.checkout_date') }}</th>
@ -129,6 +130,7 @@
<td>{{ $asset->name }}</td> <td>{{ $asset->name }}</td>
<td>{{ (($asset->model) && ($asset->model->category)) ? $asset->model->category->name : trans('general.invalid_category') }}</td> <td>{{ (($asset->model) && ($asset->model->category)) ? $asset->model->category->name : trans('general.invalid_category') }}</td>
<td>{{ ($asset->model) ? $asset->model->name : trans('general.invalid_model') }}</td> <td>{{ ($asset->model) ? $asset->model->name : trans('general.invalid_model') }}</td>
<td>{{ ($asset->defaultLoc) ? $asset->defaultLoc->name : '' }}</td>
<td>{{ ($asset->location) ? $asset->location->name : '' }}</td> <td>{{ ($asset->location) ? $asset->location->name : '' }}</td>
<td>{{ $asset->serial }}</td> <td>{{ $asset->serial }}</td>
<td> <td>
@ -155,6 +157,7 @@
<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->category->name }}</td>
<td>{{ ($asset->defaultLoc) ? $asset->defaultLoc->name : '' }}</td>
<td>{{ ($asset->location) ? $asset->location->name : '' }}</td> <td>{{ ($asset->location) ? $asset->location->name : '' }}</td>
<td>{{ $asset->model->name }}</td> <td>{{ $asset->model->name }}</td>
<td>{{ $asset->serial }}</td> <td>{{ $asset->serial }}</td>