File tree Expand file tree Collapse file tree 4 files changed +43
-6
lines changed Expand file tree Collapse file tree 4 files changed +43
-6
lines changed Original file line number Diff line number Diff line change @@ -14,6 +14,7 @@ All notable changes to `laravel-livewire-tables` will be documented in this file
14
14
15
15
- Made tableName property public so it can be accessed in views
16
16
- Fixed bulk actions dropdown on Bootstrap - https://github.com/rappasoft/laravel-livewire-tables/pull/519
17
+ - Fixed bulk row/select with pagination off - https://github.com/rappasoft/laravel-livewire-tables/issues/510
17
18
18
19
## [ 1.19.3] - 2021-10-25
19
20
Original file line number Diff line number Diff line change 1
- @if ($bulkActionsEnabled && count ($this -> bulkActions ) && (($selectPage && $rows -> total () > $rows -> count ()) || count ($selected )) )
1
+ @if (
2
+ $bulkActionsEnabled &&
3
+ count ($this -> bulkActions ) &&
4
+ (
5
+ (
6
+ $paginationEnabled && (
7
+ ($selectPage && $rows -> total () > $rows -> count ()) ||
8
+ count ($selected )
9
+ )
10
+ ) ||
11
+ count ($selected )
12
+ )
13
+ )
2
14
<x-livewire-tables::bs4 .table.row wire:key =" row-message" >
3
15
<x-livewire-tables::bs4 .table.cell colspan =" {{ $colspan } }" >
4
- @if (count ($selected ) && ! $selectAll && ! $selectPage )
16
+ @if (( ! $paginationEnabled && $selectPage ) || ( count ($selected ) && $paginationEnabled && ! $selectAll && ! $selectPage ) )
5
17
<div >
6
18
<span >
7
19
@lang (' You have selected' )
Original file line number Diff line number Diff line change 1
- @if ($bulkActionsEnabled && count ($this -> bulkActions ) && (($selectPage && $rows -> total () > $rows -> count ()) || count ($selected )) )
1
+ @if (
2
+ $bulkActionsEnabled &&
3
+ count ($this -> bulkActions ) &&
4
+ (
5
+ (
6
+ $paginationEnabled && (
7
+ ($selectPage && $rows -> total () > $rows -> count ()) ||
8
+ count ($selected )
9
+ )
10
+ ) ||
11
+ count ($selected )
12
+ )
13
+ )
2
14
<x-livewire-tables::bs5 .table.row wire:key =" row-message" >
3
15
<x-livewire-tables::bs5 .table.cell colspan =" {{ $colspan } }" >
4
- @if (count ($selected ) && ! $selectAll && ! $selectPage )
16
+ @if (( ! $paginationEnabled && $selectPage ) || ( count ($selected ) && $paginationEnabled && ! $selectAll && ! $selectPage ) )
5
17
<div >
6
18
<span >
7
19
@lang (' You have selected' )
Original file line number Diff line number Diff line change 1
- @if ($bulkActionsEnabled && count ($this -> bulkActions ) && (($selectPage && $rows -> total () > $rows -> count ()) || count ($selected )) )
1
+ @if (
2
+ $bulkActionsEnabled &&
3
+ count ($this -> bulkActions ) &&
4
+ (
5
+ (
6
+ $paginationEnabled && (
7
+ ($selectPage && $rows -> total () > $rows -> count ()) ||
8
+ count ($selected )
9
+ )
10
+ ) ||
11
+ count ($selected )
12
+ )
13
+ )
2
14
<x-livewire-tables::table .row wire:key =" row-message" class =" bg-indigo-50 dark:bg-gray-900 dark:text-white" >
3
15
<x-livewire-tables::table .cell :colspan =" $colspan" >
4
- @if (count ($selected ) && ! $selectAll && ! $selectPage )
16
+ @if (( ! $paginationEnabled && $selectPage ) || ( count ($selected ) && $paginationEnabled && ! $selectAll && ! $selectPage ) )
5
17
<div >
6
18
<span >
7
19
@lang (' You have selected' )
You can’t perform that action at this time.
0 commit comments