Skip to content

Fixed #15820 - added model number to view-assets #15822

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 14, 2024
Merged

Fixed #15820 - added model number to view-assets #15822

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions resources/views/account/view-assets.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,13 +380,8 @@
<div class="table table-responsive">
@if ($user->id)
<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 -->
@endif

<div class="box-body">
<!-- checked out assets table -->
<div class="table-responsive">

Expand Down Expand Up @@ -421,10 +416,15 @@ class="table table-striped snipe-table"
<th class="col-md-2" data-switchable="true" data-visible="true">
{{ trans('admin/hardware/table.asset_tag') }}
</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">
{{ trans('admin/hardware/table.asset_model') }}
</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">
{{ trans('admin/hardware/table.serial') }}
</th>
Expand Down Expand Up @@ -482,9 +482,10 @@ class="table table-striped snipe-table"
{{ $asset->name }}
</td>
<td>
@if ($asset->physical=='1')
{{ $asset->model->name }}
@endif
</td>
<td>
{{ $asset->model->model_number }}
</td>
<td>
{{ $asset->serial }}
Expand Down Expand Up @@ -528,7 +529,6 @@ class="table table-striped snipe-table"
</table>
</div>
</div> <!-- .table-responsive-->
</div>
</div><!-- /asset -->
<div class="tab-pane" id="licenses">

Expand Down
Loading