mirror of
https://github.com/snipe/snipe-it.git
synced 2025-02-21 03:15:45 -08:00
Merge pull request #15822 from snipe/add_model_number_to_view_assets
Fixed #15820 - added model number to view-assets
This commit is contained in:
commit
add3edba20
|
@ -380,13 +380,8 @@
|
||||||
<div class="table table-responsive">
|
<div class="table table-responsive">
|
||||||
@if ($user->id)
|
@if ($user->id)
|
||||||
<div class="box-header with-border">
|
<div class="box-header with-border">
|
||||||
<div class="box-heading">
|
|
||||||
<h2 class="box-title"> {{ trans('admin/users/general.assets_user', array('name' => $user->first_name)) }}</h2>
|
|
||||||
</div>
|
|
||||||
</div><!-- /.box-header -->
|
</div><!-- /.box-header -->
|
||||||
@endif
|
@endif
|
||||||
|
|
||||||
<div class="box-body">
|
|
||||||
<!-- checked out assets table -->
|
<!-- checked out assets table -->
|
||||||
<div class="table-responsive">
|
<div class="table-responsive">
|
||||||
|
|
||||||
|
@ -421,10 +416,15 @@
|
||||||
<th class="col-md-2" data-switchable="true" data-visible="true">
|
<th class="col-md-2" data-switchable="true" data-visible="true">
|
||||||
{{ trans('admin/hardware/table.asset_tag') }}
|
{{ trans('admin/hardware/table.asset_tag') }}
|
||||||
</th>
|
</th>
|
||||||
<th class="col-md-2" data-switchable="true" data-visible="false">{{ trans('general.name') }}</th>
|
<th class="col-md-2" data-switchable="true" data-visible="false">
|
||||||
|
{{ trans('general.name') }}
|
||||||
|
</th>
|
||||||
<th class="col-md-2" data-switchable="true" data-visible="true">
|
<th class="col-md-2" data-switchable="true" data-visible="true">
|
||||||
{{ trans('admin/hardware/table.asset_model') }}
|
{{ trans('admin/hardware/table.asset_model') }}
|
||||||
</th>
|
</th>
|
||||||
|
<th class="col-md-2" data-switchable="true" data-visible="false">
|
||||||
|
{{ trans('general.model_no') }}
|
||||||
|
</th>
|
||||||
<th class="col-md-3" data-switchable="true" data-visible="true">
|
<th class="col-md-3" data-switchable="true" data-visible="true">
|
||||||
{{ trans('admin/hardware/table.serial') }}
|
{{ trans('admin/hardware/table.serial') }}
|
||||||
</th>
|
</th>
|
||||||
|
@ -482,9 +482,10 @@
|
||||||
{{ $asset->name }}
|
{{ $asset->name }}
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
@if ($asset->physical=='1')
|
|
||||||
{{ $asset->model->name }}
|
{{ $asset->model->name }}
|
||||||
@endif
|
</td>
|
||||||
|
<td>
|
||||||
|
{{ $asset->model->model_number }}
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
{{ $asset->serial }}
|
{{ $asset->serial }}
|
||||||
|
@ -528,7 +529,6 @@
|
||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
</div> <!-- .table-responsive-->
|
</div> <!-- .table-responsive-->
|
||||||
</div>
|
|
||||||
</div><!-- /asset -->
|
</div><!-- /asset -->
|
||||||
<div class="tab-pane" id="licenses">
|
<div class="tab-pane" id="licenses">
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue