lunax/snipe_it
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Fixes #3604 - company view not displaying assets on page load

Browse source
This commit is contained in:
snipe 2017-06-01 20:28:09 -07:00
parent 66145a625c
commit ccc0063556
1 changed files with 13 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
resources/views/companies/view.blade.php
View file

@ -17,45 +17,44 @@
<li class="active"> <li class="active">
<a href="#asset_tab" data-toggle="tab"> <a href="#asset_tab" data-toggle="tab">
<span class="hidden-lg hidden-md"> <span class="hidden-lg hidden-md">
<i class="fa fa-barcode"></i> <i class="fa fa-barcode"></i>
</span> </span>
<span class="hidden-xs hidden-sm">{{ trans('general.assets') }}</span> <span class="hidden-xs hidden-sm">{{ trans('general.assets') }}</span>
</a> </a>
</li> </li>
<li> <li>
<a href="#licenses_tab" data-toggle="tab"> <a href="#licenses_tab" data-toggle="tab">
<span class="hidden-lg hidden-md"> <span class="hidden-lg hidden-md">
<i class="fa fa-floppy-o"></i> <i class="fa fa-floppy-o"></i>
</span> </span>
<span class="hidden-xs hidden-sm">{{ trans('general.licenses') }}</span> <span class="hidden-xs hidden-sm">{{ trans('general.licenses') }}</span>
</a> </a>
</li> </li>
<li> <li>
<a href="#accessories_tab" data-toggle="tab"> <a href="#accessories_tab" data-toggle="tab">
<span class="hidden-lg hidden-md"> <span class="hidden-lg hidden-md">
<i class="fa fa-keyboard-o"></i> <i class="fa fa-keyboard-o"></i>
</span> <span class="hidden-xs hidden-sm">{{ trans('general.accessories') }}</span> </span> <span class="hidden-xs hidden-sm">{{ trans('general.accessories') }}</span>
</a> </a>
</li> </li>
<li> <li>
<a href="#consumables_tab" data-toggle="tab"> <a href="#consumables_tab" data-toggle="tab">
<span class="hidden-lg hidden-md"> <span class="hidden-lg hidden-md">
<i class="fa fa-tint"></i></span> <i class="fa fa-tint"></i></span>
<span class="hidden-xs hidden-sm">{{ trans('general.consumables') }}</span> <span class="hidden-xs hidden-sm">{{ trans('general.consumables') }}</span>
</a> </a>
</li> </li>
</ul> </ul>
<div class="tab-content"> <div class="tab-content">
<div class="tab-pane" id="asset_tab"> <div class="tab-pane fade in active" id="asset_tab">
<!-- checked out assets table --> <!-- checked out assets table -->
<div class="table-responsive"> <div class="table-responsive">
<table <table
@ -64,8 +63,7 @@
id="table" id="table"
data-url="{{route('api.assets.index',['company_id' => $company->id]) }}" data-url="{{route('api.assets.index',['company_id' => $company->id]) }}"
data-cookie="true" data-cookie="true"
data-click-to-select="true" data-cookie-id-table="companyAssetsTable-{{ config('version.hash_version') }}">
data-cookie-id-table="lcompanyAssetsTable-{{ config('version.hash_version') }}">
<thead> <thead>
<tr> <tr>
<th data-sortable="true" data-field="id" data-visible="false">{{ trans('general.id') }}</th> <th data-sortable="true" data-field="id" data-visible="false">{{ trans('general.id') }}</th>