DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-28 06:59:41 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'

Browse source
This commit is contained in:
snipe 2022-08-01 14:08:16 -07:00
parent d7d0056b73 a51b446a10
commit 375963f92d
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -86,7 +86,9 @@
<div class="tab-pane fade in active" 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 table-responsive">
@include('partials.asset-bulk-actions')
<table <table
data-columns="{{ \App\Presenters\AssetPresenter::dataTableLayout() }}" data-columns="{{ \App\Presenters\AssetPresenter::dataTableLayout() }}"
data-cookie-id-table="assetsListingTable" data-cookie-id-table="assetsListingTable"
@ -98,6 +100,10 @@
data-show-export="true" data-show-export="true"
data-show-refresh="true" data-show-refresh="true"
data-sort-order="asc" data-sort-order="asc"
data-toolbar="#assetsBulkEditToolbar"
data-bulk-button-id="#bulkAssetEditButton"
data-bulk-form-id="#assetsBulkForm"
data-click-to-select="true"
id="assetsListingTable" id="assetsListingTable"
class="table table-striped snipe-table" class="table table-striped snipe-table"
data-url="{{route('api.assets.index',['company_id' => $company->id]) }}" data-url="{{route('api.assets.index',['company_id' => $company->id]) }}"

6
resources/views/hardware/view.blade.php
View file

@ -472,10 +472,14 @@
@elseif (($field->format=='DATE') && ($asset->{$field->db_column_name()}!='')) @elseif (($field->format=='DATE') && ($asset->{$field->db_column_name()}!=''))
{{ \App\Helpers\Helper::getFormattedDateObject($asset->{$field->db_column_name()}, 'date', false) }} {{ \App\Helpers\Helper::getFormattedDateObject($asset->{$field->db_column_name()}, 'date', false) }}
@else @else
{!! nl2br(e($asset->{$field->db_column_name()})) !!} &nbsp; {!! nl2br(e($asset->{$field->db_column_name()})) !!}
@endif @endif
@endif @endif
@if ($asset->{$field->db_column_name()}=='')
&nbsp;
@endif
</div> </div>
</div> </div>
@endforeach @endforeach