mirror of
https://github.com/snipe/snipe-it.git
synced 2025-03-05 20:52:15 -08:00
Merge pull request #15059 from Godmartinz/export_options
Fixed missing print user assigned filter
This commit is contained in:
commit
c58c592fb0
|
@ -6,6 +6,8 @@
|
||||||
|
|
||||||
<link rel="shortcut icon" type="image/ico" href="{{ ($snipeSettings) && ($snipeSettings->favicon!='') ? Storage::disk('public')->url(e($snipeSettings->favicon)) : config('app.url').'/favicon.ico' }}">
|
<link rel="shortcut icon" type="image/ico" href="{{ ($snipeSettings) && ($snipeSettings->favicon!='') ? Storage::disk('public')->url(e($snipeSettings->favicon)) : config('app.url').'/favicon.ico' }}">
|
||||||
|
|
||||||
|
<link rel="stylesheet" href="{{ url(mix('css/dist/bootstrap-table.css')) }}">
|
||||||
|
|
||||||
{{-- stylesheets --}}
|
{{-- stylesheets --}}
|
||||||
<link rel="stylesheet" href="{{ url(mix('css/dist/all.css')) }}">
|
<link rel="stylesheet" href="{{ url(mix('css/dist/all.css')) }}">
|
||||||
|
|
||||||
|
@ -386,18 +388,16 @@
|
||||||
<script src="{{ url(mix('js/dist/all.js')) }}" nonce="{{ csrf_token() }}"></script>
|
<script src="{{ url(mix('js/dist/all.js')) }}" nonce="{{ csrf_token() }}"></script>
|
||||||
|
|
||||||
|
|
||||||
@push('css')
|
|
||||||
<link rel="stylesheet" href="{{ url(mix('css/dist/bootstrap-table.css')) }}">
|
|
||||||
@endpush
|
|
||||||
|
|
||||||
@push('js')
|
|
||||||
|
|
||||||
|
|
||||||
<script src="{{ url(mix('js/dist/bootstrap-table.js')) }}"></script>
|
<script src="{{ url(mix('js/dist/bootstrap-table.js')) }}"></script>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
$('.snipe-table').bootstrapTable('destroy').each(function () {
|
$('.snipe-table').bootstrapTable('destroy').each(function () {
|
||||||
|
|
||||||
console.log('BS table loaded');
|
console.log('BS table loaded');
|
||||||
|
|
||||||
data_export_options = $(this).attr('data-export-options');
|
data_export_options = $(this).attr('data-export-options');
|
||||||
export_options = data_export_options ? JSON.parse(data_export_options) : {};
|
export_options = data_export_options ? JSON.parse(data_export_options) : {};
|
||||||
export_options['htmlContent'] = false; // this is already the default; but let's be explicit about it
|
export_options['htmlContent'] = false; // this is already the default; but let's be explicit about it
|
||||||
|
@ -469,7 +469,7 @@
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
@endpush
|
|
||||||
|
|
||||||
|
|
||||||
</body>
|
</body>
|
||||||
|
|
Loading…
Reference in a new issue