Browse Source

fix template when strict_variables = true

Thomas 14 years ago
parent
commit
6e0ed1487d
2 changed files with 8 additions and 3 deletions
  1. 7 2
      Admin/Admin.php
  2. 1 1
      Resources/views/CRUD/base_filter_field.twig

+ 7 - 2
Admin/Admin.php

@@ -306,6 +306,9 @@ abstract class Admin extends ContainerAware
     {
         $this->list_fields = self::getBaseFields($this->getClassMetaData(), $this->list_fields);
 
+        $this->configureListFields();
+
+        // normalize field
         foreach($this->list_fields as $name => $options) {
 
             $this->list_fields[$name]['code'] = $name;
@@ -346,6 +349,9 @@ abstract class Admin extends ContainerAware
                 $this->list_fields[$name]['identifier'] = true;
             }
 
+            if(!isset($this->list_fields[$name]['identifier'])) {
+                $this->list_fields[$name]['identifier'] = false;
+            }
         }
 
         if(!isset($this->list_fields['_batch'])) {
@@ -353,11 +359,10 @@ abstract class Admin extends ContainerAware
                 'code'     => '_batch',
                 'template' => 'Sonata/BaseApplicationBundle:CRUD:list__batch.twig',
                 'label'    => 'batch',
+                'identifier' => false
             ) ) + $this->list_fields;
         }
 
-         $this->configureListFields();
-
         return $this->list_fields;
     }
 

+ 1 - 1
Resources/views/CRUD/base_filter_field.twig

@@ -12,7 +12,7 @@ file that was distributed with this source code.
 <div>
     {% block label %}{{ form_label(filter.field) }} <br />{% endblock %}
 
-    <div class="sonata-ba-field {% if field.field.haserrors %}sonata-ba-field-error"{% endif %}">
+    <div class="sonata-ba-field {% if filter.field.haserrors %}sonata-ba-field-error"{% endif %}">
         {% block field %}{{ form_field(filter.field) }}{% endblock %}
     </div>
 </div>