Components\Filters: Fixed setDefaultValue() method

o5 · Oct 21, 2014 · 73b2d1d · 73b2d1d
1 parent 3ff769b
commit 73b2d1d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/Grido/Grid.php b/Grido/Grid.php
@@ -163,7 +163,7 @@ public function setDefaultPerPage($perPage)
      */
     public function setDefaultFilter(array $filter)
     {
-        $this->defaultFilter = $filter;
+        $this->defaultFilter = array_merge($this->defaultFilter, $filter);
         return $this;
     }
 

diff --git a/tests/Grido/Components/Filter.phpt b/tests/Grido/Components/Filter.phpt
@@ -127,6 +127,10 @@ class FilterTest extends \Tester\TestCase
         $grid->addFilterText('filter', 'Filter')
             ->setDefaultValue('default');
         Assert::same(array('filter' => 'default'), $grid->defaultFilter);
+
+        $grid->addFilterText('filter2', 'Filter2')
+            ->setDefaultValue('default2');
+        Assert::same(array('filter' => 'default', 'filter2' => 'default2'), $grid->defaultFilter);
     }
 
     function testGetWrapperPrototype()

diff --git a/tests/Grido/Grid/Grid.phpt b/tests/Grido/Grid/Grid.phpt
@@ -134,10 +134,6 @@ class GridTest extends \Tester\TestCase
     {
         $grid = new Grid;
 
-        Assert::error(function() use ($grid) {
-            $grid->setDefaultFilter('');
-        }, E_RECOVERABLE_ERROR);
-
         $data = array(
             array('A' => 'A1', 'B' => 'B1'),
             array('A' => 'A2', 'B' => 'B2'),