Merge remote-tracking branch 'origin/develop'

This commit is contained in:
snipe 2023-10-18 13:06:21 +01:00
commit 14a0c9b5db

View file

@ -46,7 +46,7 @@
data-sort-order="asc" data-sort-order="asc"
id="manufacturersTable" id="manufacturersTable"
class="table table-striped snipe-table" class="table table-striped snipe-table"
data-url="{{route('api.manufacturers.index', ['deleted' => e(Request::get('deleted')) ]) }}" data-url="{{route('api.manufacturers.index', ['deleted' => (request('deleted')=='true') ? 'true' : 'false' ]) }}"
data-export-options='{ data-export-options='{
"fileName": "export-manufacturers-{{ date('Y-m-d') }}", "fileName": "export-manufacturers-{{ date('Y-m-d') }}",
"ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"] "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]