From a9d00b6ee8576c196ead930a8179083d1a805b98 Mon Sep 17 00:00:00 2001 From: Anthony Rappa Date: Sun, 25 Apr 2021 11:57:52 -0400 Subject: [PATCH 01/10] Fix readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d1534e609..cf27badb9 100644 --- a/README.md +++ b/README.md @@ -358,7 +358,7 @@ You can also pass a callback for more control: ```php Column::make('Type') - ->searchable(function (Builder $query, $searchTerm) { + ->searchable(function (Builder $query, $searchTerm) { $query->orWhere(...); }), ``` From ccca70121cc23c44e78ba11bdc06e804456e75e7 Mon Sep 17 00:00:00 2001 From: Byron DeLaMatre Date: Sun, 25 Apr 2021 13:03:54 -0400 Subject: [PATCH 02/10] grab value's label from filter definitions, only tested tailwind --- .../views/bootstrap-4/includes/filter-pills.blade.php | 7 ++++++- .../views/bootstrap-5/includes/filter-pills.blade.php | 7 ++++++- resources/views/tailwind/includes/filter-pills.blade.php | 7 ++++++- src/Traits/WithFilters.php | 3 ++- 4 files changed, 20 insertions(+), 4 deletions(-) diff --git a/resources/views/bootstrap-4/includes/filter-pills.blade.php b/resources/views/bootstrap-4/includes/filter-pills.blade.php index 4365ada95..c0bf28cd6 100644 --- a/resources/views/bootstrap-4/includes/filter-pills.blade.php +++ b/resources/views/bootstrap-4/includes/filter-pills.blade.php @@ -8,7 +8,12 @@ wire:key="filter-pill-{{ $key }}" class="badge badge-pill badge-info d-inline-flex align-items-center" > - {{ $filterNames[$key] ?? ucwords(strtr($key, ['_' => ' ', '-' => ' '])) }}: {{ ucwords(strtr($value, ['_' => ' ', '-' => ' '])) }} + {{ $filterNames[$key] ?? ucwords(strtr($key, ['_' => ' ', '-' => ' '])) }}: + @if(isset($customFilters[$key]) && method_exists($customFilters[$key], 'options')) + {{ $customFilters[$key]->options()[$value] ?? $value }} + @else + {{ ucwords(strtr($value, ['_' => ' ', '-' => ' '])) }} + @endif - {{ $filterNames[$key] ?? ucwords(strtr($key, ['_' => ' ', '-' => ' '])) }}: {{ ucwords(strtr($value, ['_' => ' ', '-' => ' '])) }} + {{ $filterNames[$key] ?? ucwords(strtr($key, ['_' => ' ', '-' => ' '])) }}: + @if(isset($customFilters[$key]) && method_exists($customFilters[$key], 'options')) + {{ $customFilters[$key]->options()[$value] ?? $value }} + @else + {{ ucwords(strtr($value, ['_' => ' ', '-' => ' '])) }} + @endif - {{ $filterNames[$key] ?? ucwords(strtr($key, ['_' => ' ', '-' => ' '])) }}: {{ ucwords(strtr($value, ['_' => ' ', '-' => ' '])) }} + {{ $filterNames[$key] ?? ucwords(strtr($key, ['_' => ' ', '-' => ' '])) }}: + @if(isset($customFilters[$key]) && method_exists($customFilters[$key], 'options')) + {{ $customFilters[$key]->options()[$value] ?? $value }} + @else + {{ ucwords(strtr($value, ['_' => ' ', '-' => ' '])) }} + @endif