Merge pull request #79 from alessandropietrobelli/master

Filter Select (with int index array options)
ThaDafinser · Mar 24, 2014 · cfeddec · cfeddec
2 parents aef3d7a + 7529c67
commit cfeddec
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/ZfcDatagrid/Column/AbstractColumn.php b/src/ZfcDatagrid/Column/AbstractColumn.php
@@ -424,12 +424,14 @@ public function getFilterDefaultOperation()
      */
     public function setFilterSelectOptions(array $options = null, $noSelect = true)
     {
+        // This work also with options with integer based array index such as
+        // array(0 => 'zero', 1 => 'once', 2 => 'double', 3 => 'triple'....) 
+
         if ($noSelect === true) {
-            $nothing = array(
-                '' => '-'
-            );
-            $options = array_merge($nothing, $options);
+            $options[''] = '-';
+            $this->setFilterDefaultValue('');
         }
+
         $this->filterSelectOptions = $options;
     }
 

diff --git a/view/zfc-datagrid/renderer/bootstrapTable/layout.phtml b/view/zfc-datagrid/renderer/bootstrapTable/layout.phtml
@@ -119,6 +119,8 @@ if($this->rowClickAction !== null){
                             foreach ($column->getFilterSelectOptions() as $value => $option) {
                                 if ($column->getFilterActiveValue() == sprintf($column->getFilterDefaultOperation(), $value)) {
                                     $htmlFilter .= '<option value="' . $value . '" selected="selected">' . $option . '</option>';
+                                } else if (($column->getFilterActiveValue() == '') && ($value == '')){
+                                    $htmlFilter .= '<option value="' . $value . '" selected="selected">' . $option . '</option>';
                                 } else {
                                     $htmlFilter .= '<option value="' . $value . '">' . $option . '</option>';
                                 }