From ad95651ca7147f20ca828362431600af5f60af09 Mon Sep 17 00:00:00 2001 From: Arjay Angeles Date: Sat, 15 Aug 2015 11:07:00 +0800 Subject: [PATCH 1/3] Add support for filtering compound key PR #146 --- src/yajra/Datatables/Engines/CollectionEngine.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/yajra/Datatables/Engines/CollectionEngine.php b/src/yajra/Datatables/Engines/CollectionEngine.php index 28620bae..e74a5b34 100644 --- a/src/yajra/Datatables/Engines/CollectionEngine.php +++ b/src/yajra/Datatables/Engines/CollectionEngine.php @@ -12,6 +12,7 @@ use Closure; use Illuminate\Contracts\Support\Arrayable; +use Illuminate\Support\Arr; use Illuminate\Support\Collection; use Illuminate\Support\Str; use yajra\Datatables\Contracts\DataTableEngine; @@ -123,15 +124,14 @@ function ($row) use ($columns) { $keyword = $this->request->keyword(); foreach ($this->request->searchableColumnIndex() as $index) { $column = $this->getColumnName($index); - - if ( ! array_key_exists($column, $data)) { + if ( ! $value = Arr::get($data, $column)) { continue; } if ($this->isCaseInsensitive()) { - $found[] = Str::contains(Str::lower($data[$column]), Str::lower($keyword)); + $found[] = Str::contains(Str::lower($value), Str::lower($keyword)); } else { - $found[] = Str::contains($data[$column], $keyword); + $found[] = Str::contains($value, $keyword); } } From 3429808f47fcb5933ba994ba1477d5536f1bdc79 Mon Sep 17 00:00:00 2001 From: Arjay Angeles Date: Sat, 15 Aug 2015 11:07:28 +0800 Subject: [PATCH 2/3] Add support for ordering using compound key --- src/yajra/Datatables/Engines/CollectionEngine.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/yajra/Datatables/Engines/CollectionEngine.php b/src/yajra/Datatables/Engines/CollectionEngine.php index e74a5b34..8c24f487 100644 --- a/src/yajra/Datatables/Engines/CollectionEngine.php +++ b/src/yajra/Datatables/Engines/CollectionEngine.php @@ -99,7 +99,7 @@ public function ordering() function ($row) use ($column) { $row = Helper::castToArray($row); - return $row[$column]; + return Arr::get($row, $column); } ); From b7fabd8ebec9e7cdf739d30dad7314a41248c414 Mon Sep 17 00:00:00 2001 From: Arjay Angeles Date: Sat, 15 Aug 2015 11:09:35 +0800 Subject: [PATCH 3/3] Bump v5.11.1 --- change-log.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/change-log.md b/change-log.md index bd425ae3..eaee740e 100644 --- a/change-log.md +++ b/change-log.md @@ -8,6 +8,11 @@ ##Change Log +###v5.11.1 + - Collection engine enhancement. + - Add support for filtering compound key PR #146. + - Add support for ordering using compound key. + ###v5.11.0 - Add support for rendering view directly on addColumn and editColumn.