Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[3.5][Feature][Ready] Export improvements #1703

Merged
merged 4 commits into from
Nov 15, 2018
Merged

[3.5][Feature][Ready] Export improvements #1703

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
42a52c9
added exportable option to columns
tabacitu Nov 15, 2018
1cb109a
added hidden option to columns
tabacitu Nov 15, 2018
e4d3144
rename hidden columns option to visibleInTable
tabacitu Nov 15, 2018
e84c1da
renamed exportable to visibleInExport
tabacitu Nov 15, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
renamed exportable to visibleInExport
  • Loading branch information
@tabacitu
tabacitu committed Nov 15, 2018
commit e84c1da4e11d5cdfa39d404643226e4b04dd6f97
6 changes: 4 additions & 2 deletions src/PanelTraits/Read.php
View file
Original file line number Diff line number Diff line change
@@ -177,8 +177,9 @@ public function enableBulkActions()
'priority' => 1,
'searchLogic' => false,
'orderable' => false,
'visibleInTable' => true,
'visibleInModal' => false,
'exportable' => false,
'visibleInExport' => false,
])->makeFirstColumn();

$this->addColumn([
@@ -188,8 +189,9 @@ public function enableBulkActions()
'priority' => 1,
'searchLogic' => false,
'orderable' => false,
'visibleInTabel' => true,
'visibleInModal' => false,
'exportable' => false,
'visibleInExport' => false,
])->makeFirstColumn();
}

12 changes: 6 additions & 6 deletions src/resources/views/inc/export_buttons.blade.php
View file
Original file line number Diff line number Diff line change
@@ -11,13 +11,13 @@
crud.dataTableConfiguration.buttons = [
{
extend: 'colvis',
columns: ':not(.not-export-col):not([data-exportable=false])'
columns: ':not(.not-export-col):not([data-visible-in-export=false])'
},
{
name: 'copyHtml5',
extend: 'copyHtml5',
exportOptions: {
columns: [':visible:not(.not-export-col):not(.hidden):not([data-exportable=false])'],
columns: [':visible:not(.not-export-col):not(.hidden):not([data-visible-in-export=false])'],
},
action: function(e, dt, button, config) {
crud.responsiveToggle(dt);
@@ -29,7 +29,7 @@
name: 'excelHtml5',
extend: 'excelHtml5',
exportOptions: {
columns: [':visible:not(.not-export-col):not(.hidden):not([data-exportable=false])'],
columns: [':visible:not(.not-export-col):not(.hidden):not([data-visible-in-export=false])'],
},
action: function(e, dt, button, config) {
crud.responsiveToggle(dt);
@@ -41,7 +41,7 @@
name: 'csvHtml5',
extend: 'csvHtml5',
exportOptions: {
columns: [':visible:not(.not-export-col):not(.hidden):not([data-exportable=false])'],
columns: [':visible:not(.not-export-col):not(.hidden):not([data-visible-in-export=false])'],
},
action: function(e, dt, button, config) {
crud.responsiveToggle(dt);
@@ -53,7 +53,7 @@
name: 'pdfHtml5',
extend: 'pdfHtml5',
exportOptions: {
columns: [':visible:not(.not-export-col):not(.hidden):not([data-exportable=false])'],
columns: [':visible:not(.not-export-col):not(.hidden):not([data-visible-in-export=false])'],
},
orientation: 'landscape',
action: function(e, dt, button, config) {
@@ -66,7 +66,7 @@
name: 'print',
extend: 'print',
exportOptions: {
columns: [':visible:not(.not-export-col):not(.hidden):not([data-exportable=false])'],
columns: [':visible:not(.not-export-col):not(.hidden):not([data-visible-in-export=false])'],
},
action: function(e, dt, button, config) {
crud.responsiveToggle(dt);
4 changes: 2 additions & 2 deletions src/resources/views/list.blade.php
View file
Original file line number Diff line number Diff line change
@@ -54,14 +54,14 @@
data-priority="{{ $column['priority'] }}"
data-visible-in-modal="{{ (isset($column['visibleInModal']) && $column['visibleInModal'] == false) ? 'false' : 'true' }}"
data-visible="{{ !isset($column['visibleInTable']) ? 'true' : (($column['visibleInTable'] == false) ? 'false' : 'true') }}"
data-exportable="{{ (isset($column['exportable']) && $column['exportable'] == false) ? 'false' : 'true' }}"
data-visible-in-export="{{ (isset($column['visibleInExport']) && $column['visibleInExport'] == false) ? 'false' : 'true' }}"
>
{!! $column['label'] !!}
</th>
@endforeach

@if ( $crud->buttons->where('stack', 'line')->count() )
<th data-orderable="false" data-priority="{{ $crud->getActionsColumnPriority() }}" data-exportable="false">{{ trans('backpack::crud.actions') }}</th>
<th data-orderable="false" data-priority="{{ $crud->getActionsColumnPriority() }}" data-visible-in-export="false">{{ trans('backpack::crud.actions') }}</th>
@endif
</tr>
</thead>