Skip to content

Commit b075759

Browse files
authored
Merge pull request #198 from rappasoft/develop
0.4
2 parents d36f332 + 78425ec commit b075759

File tree

5 files changed

+18
-3
lines changed

5 files changed

+18
-3
lines changed

CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,14 @@ All notable changes to `laravel-livewire-tables` will be documented in this file
44

55
## [Unreleased]
66

7+
## [0.4.0] - 2021-04-14
8+
9+
### Changed
10+
11+
- Fixed polling issue
12+
- Fixed [MongoDB per page issue](https://github.com/rappasoft/laravel-livewire-tables/pull/107)
13+
- [Fixed use of $clearSearchButtonClass variable](https://github.com/rappasoft/laravel-livewire-tables/pull/118)
14+
715
## [0.3.3] - 2020-12-13
816

917
### Added

resources/views/bootstrap-4/includes/options.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class="form-control"
2727
/>
2828
@if ($clearSearchButton)
2929
<div class="input-group-append">
30-
<button class="btn btn-outline-dark" type="button" wire:click="clearSearch">@lang('laravel-livewire-tables::strings.clear')</button>
30+
<button class="{{ $clearSearchButtonClass }}" type="button" wire:click="clearSearch">@lang('laravel-livewire-tables::strings.clear')</button>
3131
</div>
3232
</div>
3333
@endif

resources/views/bootstrap-4/table-component.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<div
22
class="{{ $this->getOption('bootstrap.container') ? 'container-fluid' : '' }}"
3-
@if (is_numeric($refresh)) wire:poll.{{ $refresh }}.ms @elseif(is_string($refresh)) wire:poll="{{ $refresh }}" @endif
3+
@if (is_numeric($refresh)) wire:poll.{{ $refresh }}ms @elseif(is_string($refresh)) wire:poll="{{ $refresh }}" @endif
44
>
55
@include('laravel-livewire-tables::'.config('laravel-livewire-tables.theme').'.includes.offline')
66
@include('laravel-livewire-tables::'.config('laravel-livewire-tables.theme').'.includes.options')

src/TableComponent.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ public function render(): View
9696
{
9797
return view($this->view(), [
9898
'columns' => $this->columns(),
99-
'models' => $this->paginationEnabled ? $this->models()->paginate($this->perPage) : $this->models()->get(),
99+
'models' => $this->paginationEnabled ? $this->models()->paginate((int) $this->perPage) : $this->models()->get(),
100100
]);
101101
}
102102

src/Traits/Search.php

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,13 @@ trait Search
4242
*/
4343
public $clearSearchButton = false;
4444

45+
/**
46+
* The class applied to the clear button.
47+
*
48+
* @var bool
49+
*/
50+
public $clearSearchButtonClass = 'btn btn-outline-dark';
51+
4552
/**
4653
* Resets the search string.
4754
*/

0 commit comments

Comments
 (0)