DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-03-05 20:52:15 -08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #10767 from uberbrady/fix_double_request_datatable

Browse source 
One attempt to fix the 'datatable double-request' problem.
This commit is contained in:
snipe 2022-03-08 20:34:15 -08:00 committed by GitHub
parent 1b3631d57d 8d49d35463
commit c817daa4da
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
resources/views/partials/bootstrap-table.blade.php
View file

@ -31,7 +31,7 @@
return false; return false;
} }
$('.snipe-table').bootstrapTable('destroy').bootstrapTable({ $('.snipe-table').bootstrapTable({
classes: 'table table-responsive table-no-bordered', classes: 'table table-responsive table-no-bordered',
ajaxOptions: { ajaxOptions: {
headers: { headers: {

2
resources/views/reports/activity.blade.php
View file

@ -35,7 +35,7 @@
id="activityReport" id="activityReport"
data-url="{{ route('api.activity.index') }}" data-url="{{ route('api.activity.index') }}"
data-mobile-responsive="true" data-mobile-responsive="true"
data-toggle="table" {{-- data-toggle="table" --}}
class="table table-striped snipe-table" class="table table-striped snipe-table"
data-export-options='{ data-export-options='{
"fileName": "activity-report-{{ date('Y-m-d') }}", "fileName": "activity-report-{{ date('Y-m-d') }}",

2
resources/views/reports/depreciation.blade.php
View file

@ -33,7 +33,7 @@
id="depreciationReport" id="depreciationReport"
data-url="{{ route('api.depreciation-report.index') }}" data-url="{{ route('api.depreciation-report.index') }}"
data-mobile-responsive="true" data-mobile-responsive="true"
data-toggle="table" {{-- data-toggle="table" --}}
class="table table-striped snipe-table" class="table table-striped snipe-table"
data-columns="{{ \App\Presenters\DepreciationReportPresenter::dataTableLayout() }}" data-columns="{{ \App\Presenters\DepreciationReportPresenter::dataTableLayout() }}"
data-export-options='{ data-export-options='{