Add possibility to hide advanced filters

kwuerl · Apr 14, 2015 · 4912fbc · 4912fbc
1 parent 4ab4a8d
commit 4912fbc
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 20 deletions.
diff --git a/Filter/Filter.php b/Filter/Filter.php
@@ -183,7 +183,7 @@ public function getAssociationMapping()
     public function setOptions(array $options)
     {
         $this->options = array_merge(
-            array('show_filter' => null),
+            array('show_filter' => null, 'advanced_filter' => true),
             $this->getDefaultOptions(),
             $options
         );

diff --git a/Form/Type/Filter/ChoiceType.php b/Form/Type/Filter/ChoiceType.php
@@ -54,8 +54,10 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             self::TYPE_EQUAL           => $this->translator->trans('label_type_equals', array(), 'SonataAdminBundle'),
         );
 
+        $operatorChoices = $options['operator_type'] !== 'hidden' ? array('choices' => $choices) : array();
+
         $builder
-            ->add('type', 'choice', array('choices' => $choices, 'required' => false))
+            ->add('type', $options['operator_type'], array_merge(array('required' => false), $options['operator_options'], $operatorChoices))
             ->add('value', $options['field_type'], array_merge(array('required' => false), $options['field_options']))
         ;
     }
@@ -67,7 +69,9 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
         $resolver->setDefaults(array(
             'field_type'       => 'choice',
-            'field_options'    => array()
+            'field_options'    => array(),
+            'operator_type'    => 'choice',
+            'operator_options' => [],
         ));
     }
 }
diff --git a/Resources/doc/reference/action_list.rst b/Resources/doc/reference/action_list.rst
@@ -272,6 +272,17 @@ Though this ``operator_type`` is automatically detected it can be changed or eve
         ;
     }
 
+If you don't need the advanced filters, or all your ``operator_type`` are hidden, you can disable them by setting
+``advanced_filter`` to ``false``. You need to disable all advanced filters to make the button disappear.
+
+.. code-block:: php
+
+    protected function configureDatagridFilters(DatagridMapper $datagridMapper)
+    {
+        $datagridMapper
+            ->add('bar', null, array('operator_type' => 'hidden', 'advanced_filter' => false))
+        ;
+    }
 
 Default filters
 ^^^^^^^^^^^^^^^

diff --git a/Resources/views/CRUD/base_list.html.twig b/Resources/views/CRUD/base_list.html.twig
@@ -235,6 +235,7 @@ file that was distributed with this source code.
 
                         <div class="row">
                             <div class="col-sm-9">
+                                {% set withAdvancedFilter = false %}
                                 {% for filter in admin.datagrid.filters %}
                                     <div class="form-group" id="filter-{{ admin.uniqid }}-{{ filter.name }}" sonata-filter="{{ (filter.options['show_filter'] is sameas(true) or filter.options['show_filter'] is null) ? 'true' : 'false' }}" style="display: {% if (filter.isActive() and filter.options['show_filter'] is null) or (filter.options['show_filter'] is sameas(true)) %}block{% else %}none{% endif %}">
                                         {% if filter.label is not sameas(false) %}
@@ -258,6 +259,10 @@ file that was distributed with this source code.
                                             </label>
                                         </div>
                                     </div>
+
+                                    {% if filter.options['advanced_filter'] %}
+                                        {% set withAdvancedFilter = true %}
+                                    {% endif %}
                                 {% endfor %}
                             </div>
                             <div class="col-sm-3 text-center">
@@ -276,12 +281,14 @@ file that was distributed with this source code.
                                     </a>
                                 </div>
 
-                                <div class="form-group">
-                                    <a href="#" data-toggle="advanced-filter">
-                                        <i class="fa fa-cogs"></i>
-                                        {{ 'btn_advanced_filters'|trans({}, 'SonataAdminBundle') }}
-                                    </a>
-                                </div>
+                                {% if withAdvancedFilter %}
+                                    <div class="form-group">
+                                        <a href="#" data-toggle="advanced-filter">
+                                            <i class="fa fa-cogs"></i>
+                                            {{ 'btn_advanced_filters'|trans({}, 'SonataAdminBundle') }}
+                                        </a>
+                                    </div>
+                                {% endif %}
                             </div>
                         </div>
 

diff --git a/Tests/Admin/AdminTest.php b/Tests/Admin/AdminTest.php
@@ -572,7 +572,7 @@ public function testGetBaseRouteNameWithChildAdmin()
     }
 
     /**
-     * @expectedException RuntimeException
+     * @expectedException \RuntimeException
      */
     public function testGetBaseRouteNameWithUnreconizedClassname()
     {
@@ -672,7 +672,7 @@ public function testSubClass()
     }
 
     /**
-     * @expectedException RuntimeException
+     * @expectedException \RuntimeException
      */
     public function testNonExistantSubclass()
     {
@@ -1529,7 +1529,7 @@ public function testGetFilterFieldDescription()
                         break;
 
                     default:
-                        throw new \RuntiemException(sprintf('Unknown filter name "%s"', $name));
+                        throw new \RuntimeException(sprintf('Unknown filter name "%s"', $name));
                         break;
                 }
 

diff --git a/Tests/Datagrid/DatagridMapperTest.php b/Tests/Datagrid/DatagridMapperTest.php
@@ -12,15 +12,8 @@
 
 namespace Sonata\AdminBundle\Tests\Datagrid;
 
-use Sonata\AdminBundle\Admin\AdminInterface;
-use Sonata\AdminBundle\Builder\DatagridBuilderInterface;
 use Sonata\AdminBundle\Datagrid\DatagridMapper;
 use Sonata\AdminBundle\Datagrid\Datagrid;
-use Sonata\AdminBundle\Datagrid\ProxyQueryInterface;
-use Sonata\AdminBundle\Admin\FieldDescriptionCollection;
-use Sonata\AdminBundle\Datagrid\PagerInterface;
-use Sonata\AdminBundle\Filter\Filter;
-use Sonata\AdminBundle\Filter\FilterInterface;
 
 /**
  * @author Andrej Hudec <[email protected]>
@@ -122,6 +115,7 @@ public function testGet()
             'placeholder' => 'short_object_description_placeholder',
             'link_parameters' => array(),
             'show_filter' => null,
+            'advanced_filter' => true,
         ), $filter->getOptions());
     }
 
@@ -150,6 +144,7 @@ public function testGet2()
             'foo_filter_option' => 'foo_filter_option_value',
             'link_parameters' => array(),
             'show_filter' => null,
+            'advanced_filter' => true,
         ), $filter->getOptions());
     }
 

diff --git a/Tests/Filter/FilterTest.php b/Tests/Filter/FilterTest.php
@@ -11,7 +11,6 @@
 
 namespace Sonata\AdminBundle\Tests\Filter;
 
-use Sonata\AdminBundle\Filter\Filter;
 use Sonata\AdminBundle\Tests\Fixtures\Filter\FooFilter;
 
 class FilterTest extends \PHPUnit_Framework_TestCase
@@ -39,6 +38,7 @@ public function testFilter()
         $expected = $options;
         $expected['foo'] = 'bar';
         $expected['show_filter'] = null;
+        $expected['advanced_filter'] = true;
 
         $this->assertEquals($expected, $filter->getOptions());
         $this->assertEquals('name', $filter->getFieldName());