Changed values of boolean fields in search filter

mgiagnoni · Jun 27, 2012 · ebbcdde · ebbcdde
1 parent b18b8d8
commit ebbcdde
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 9 deletions.
diff --git a/DependencyInjection/LyraAdminExtension.php b/DependencyInjection/LyraAdminExtension.php
@@ -429,7 +429,7 @@ private function setFilterFieldsDefaults()
                     case 'choice':
                         $filters[$field]['options'] = array_merge(
                             $filters[$field]['options'], array(
-                                'choices' => array(1 => 'Yes', 0 => 'No', null => 'Both'),
+                                'choices' => array('on' => 'Yes', 'off' => 'No', null => 'Both'),
                                 'expanded' => true
                             )
                         );

diff --git a/Filter/Filter.php b/Filter/Filter.php
@@ -228,14 +228,9 @@ protected function removeEmptyCriteria($criteria)
                         $value = null;
                     }
                     break;
-                case 'boolean':
-                    if ('' == $value) {
-                        $value = null;
-                    }
-                    break;
             }
 
-            if (null !== $value) {
+            if (!empty($value)) {
                 $filtered[$name] = $value;
             }
         }

diff --git a/QueryBuilder/QueryBuilder.php b/QueryBuilder/QueryBuilder.php
@@ -128,7 +128,7 @@ protected function addFilterCriteria($qb, $criteria)
                         break;
                     case 'boolean':
                         $qb->andWhere(
-                            $qb->expr()->eq($alias.'.'.$field, $value)
+                            $qb->expr()->eq($alias.'.'.$field, $value === 'on' ? 1 : 0)
                         );
 
                          break;

diff --git a/Resources/views/Filter/dialog.html.twig b/Resources/views/Filter/dialog.html.twig
@@ -18,7 +18,7 @@
                             {{ (date.from is empty ? 'filter.date.upto' : 'filter.date.to')|trans({}, 'LyraAdminBundle')}} {{ date.to|date('j/M/Y') }}
                         {% endif %}
                     {% elseif field.type == 'boolean' %}
-                        {{ (criteria[field.name] ? 'show.boolean.true' : 'show.boolean.false')|trans({}, 'LyraAdminBundle') }}
+                        {{ (criteria[field.name] == 'on' ? 'show.boolean.true' : 'show.boolean.false')|trans({}, 'LyraAdminBundle') }}
                     {% else %}
                         {{ criteria[field.name] }}
                     {% endif %}