Преглед изворни кода

Merge pull request #2061 from boajer/master

fixed - Hardcoded template for styling filters
Thomas пре 11 година
родитељ
комит
1c57a9d97e

+ 1 - 0
DependencyInjection/Compiler/AddDependencyCallsCompilerPass.php

@@ -281,6 +281,7 @@ class AddDependencyCallsCompilerPass implements CompilerPassInterface
             'ajax'                     => 'SonataAdminBundle::ajax_layout.html.twig',
             'dashboard'                => 'SonataAdminBundle:Core:dashboard.html.twig',
             'list'                     => 'SonataAdminBundle:CRUD:list.html.twig',
+            'filter'                   => 'SonataAdminBundle:Form:filter_admin_fields.html.twig',
             'show'                     => 'SonataAdminBundle:CRUD:show.html.twig',
             'edit'                     => 'SonataAdminBundle:CRUD:edit.html.twig',
             'history'                  => 'SonataAdminBundle:CRUD:history.html.twig',

+ 1 - 0
DependencyInjection/Configuration.php

@@ -161,6 +161,7 @@ class Configuration implements ConfigurationInterface
                         ->scalarNode('dashboard')->defaultValue('SonataAdminBundle:Core:dashboard.html.twig')->cannotBeEmpty()->end()
                         ->scalarNode('search')->defaultValue('SonataAdminBundle:Core:search.html.twig')->cannotBeEmpty()->end()
                         ->scalarNode('list')->defaultValue('SonataAdminBundle:CRUD:list.html.twig')->cannotBeEmpty()->end()
+                        ->scalarNode('filter')->defaultValue('SonataAdminBundle:Form:filter_admin_fields.html.twig')->cannotBeEmpty()->end()
                         ->scalarNode('show')->defaultValue('SonataAdminBundle:CRUD:show.html.twig')->cannotBeEmpty()->end()
                         ->scalarNode('edit')->defaultValue('SonataAdminBundle:CRUD:edit.html.twig')->cannotBeEmpty()->end()
                         ->scalarNode('preview')->defaultValue('SonataAdminBundle:CRUD:preview.html.twig')->cannotBeEmpty()->end()

+ 1 - 0
Resources/doc/reference/configuration.rst

@@ -103,6 +103,7 @@ Full Configuration Options
                 dashboard:            SonataAdminBundle:Core:dashboard.html.twig
                 search:               SonataAdminBundle:Core:search.html.twig
                 list:                 SonataAdminBundle:CRUD:list.html.twig
+                filter:               SonataAdminBundle:Form:filter_admin_fields.html.twig
                 show:                 SonataAdminBundle:CRUD:show.html.twig
                 edit:                 SonataAdminBundle:CRUD:edit.html.twig
                 preview:              SonataAdminBundle:CRUD:preview.html.twig

+ 1 - 0
Resources/doc/reference/templates.rst

@@ -110,6 +110,7 @@ You can specify your templates in the config.yml file, like so:
                 acl:     SonataAdminBundle:CRUD:acl.html.twig
                 action:  SonataAdminBundle:CRUD:action.html.twig
                 select:  SonataAdminBundle:CRUD:list__select.html.twig
+                filter:  SonataAdminBundle:Form:filter_admin_fields.html.twig
                 dashboard:           SonataAdminBundle:Core:dashboard.html.twig
                 search:              SonataAdminBundle:Core:search.html.twig
                 batch_confirmation:  SonataAdminBundle:CRUD:batch_confirmation.html.twig

+ 1 - 1
Resources/views/CRUD/base_list.html.twig

@@ -188,7 +188,7 @@ file that was distributed with this source code.
 
 {% block list_filters %}
     {% if admin.datagrid.filters %}
-        {% form_theme form "SonataAdminBundle:Form:filter_admin_fields.html.twig" %}
+        {% form_theme form admin.getTemplate('filter') %}
         <div class="box box-primary">
             <div class="box-header">
                 <h4 class="box-title filter_legend {{ admin.datagrid.hasActiveFilters ? 'active' : 'inactive' }}">{{ 'label_filters'|trans({}, 'SonataAdminBundle') }}</h4>