ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed assets checked out to assets listing table

Browse Source
This commit is contained in:
snipe
2018-02-23 05:53:00 -08:00
parent 5e5ba54c3e
commit 0e48837eec
2 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
resources/views/hardware/view.blade.php
View File

@@ -627,19 +627,24 @@
<div class="table-responsive">
<table
class="table table-striped snipe-table"
data-toolbar="#toolbar"
data-columns="{{ \App\Presenters\AssetPresenter::dataTableLayout() }}"
data-cookie-id-table="assetsTable"
data-pagination="true"
data-id-table="assetsTable"
data-search="true"
data-side-pagination="server"
data-show-columns="true"
data-show-export="true"
data-show-refresh="true"
data-export-options='{
"fileName": "{{ str_slug($asset->asset_tag) }}-assets-export",
"ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
}'
data-search="false"
data-sort-order="asc"
id="assetsListingTable"
class="table table-striped snipe-table"
data-url="{{route('api.assets.index',['assigned_to' => $asset->id, 'assigned_type' => 'App\Models\Asset']) }}"
data-show-footer="true"
data-cookie-id-table="assetAssetsTable"
data-columns="{{ \App\Presenters\AssetPresenter::dataTableLayout() }}">
data-export-options='{
"fileName": "export-assets-{{ str_slug($asset->name) }}-assets-{{ date('Y-m-d') }}",
"ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
}'>
</table>

2
resources/views/statuslabels/view.blade.php
View File

@@ -46,7 +46,7 @@
class="table table-striped snipe-table"
data-url="{{route('api.assets.index', ['status_id' => $statuslabel->id]) }}"
data-export-options='{
"fileName": "export-locations-{{ str_slug($statuslabel->name) }}-assets-{{ date('Y-m-d') }}",
"fileName": "export-assets-{{ str_slug($statuslabel->name) }}-assets-{{ date('Y-m-d') }}",
"ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
}'>
</table>