Filters\Text: Added context into suggestion callback

o5 · Dec 4, 2014 · 302eec9 · 302eec9
1 parent 9093bd4
commit 302eec9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/Components/Filters/Text.php b/src/Components/Filters/Text.php
@@ -128,7 +128,7 @@ public function handleSuggest($query)
             $items = $this->grid->model->suggest($column, $conditions, $this->suggestionLimit);
 
         } else {
-            $items = callback($this->suggestionCallback)->invokeArgs(array($query, $actualFilter, $conditions));
+            $items = callback($this->suggestionCallback)->invokeArgs(array($query, $actualFilter, $conditions, $this));
             if (!is_array($items)) {
                 throw new \Exception('Items must be an array.');
             }

diff --git a/tests/Components/Filter.Text.phpt b/tests/Components/Filter.Text.phpt
@@ -35,9 +35,10 @@ class FilterTextTest extends \Tester\TestCase
 
             $grid->addFilterText('test', 'Test')
                 ->setSuggestion()
-                    ->setSuggestionCallback(function($query, $filter, $conditions) {
+                    ->setSuggestionCallback(function($query, $filter, $conditions, $filterComp) use ($grid) {
                         Assert::same('QUERY', $query);
                         Assert::same(array('name' => 'aa'), $filter);
+                        Assert::same($grid->getFilter('test'), $filterComp);
 
                         $cond = new \Grido\Components\Filters\Condition('name', 'LIKE ?', '%aa%');
                         Assert::same($cond->__toArray(), $conditions[0]->__toArray());