bug #1252 Improved templates to always include first the overridden t…

…emplates (javiereguiluz)

This PR was squashed before being merged into the master branch (closes #1252).

Discussion
----------

Improved templates to always include first the overridden templates

This should fix #1241.

Commits
-------

2d9cb96 Improved templates to always include first the overridden templates

Resources/doc/book/3-list-search-show-configuration.md

@@ -758,7 +758,10 @@ features. Inside these templates you have access to the following variables:
   * `value`, the content of the property being rendered, which can be a variable
     of any type (string, numeric, boolean, array, etc.)
   * `view`, a string with the name of the view where the field is being rendered
-    (`show` or `list`).
+    (`show` or `list`);
+  * `entity_config`, an array with the full configuration of the currently
+    selected entity;
+  * `backend_config`, an array with the full backend configuration.
 
 ### Rendering Entity Properties with Custom Templates
 

Resources/views/default/field_array.html.twig

@@ -7,7 +7,7 @@
         </ul>
     {% else %}
         <div class="empty collection-empty">
-            <span class="label label-empty">{{ 'label.empty'|trans({}, 'EasyAdminBundle') }}</span>
+            {{ include(entity_config.templates.label_empty) }}
         </div>
     {% endif %}
 {% else %}

Resources/views/default/field_association.html.twig

@@ -21,7 +21,7 @@
             </ul>
         {% else %}
             <div class="empty collection-empty">
-                <span class="label label-empty">{{ 'label.empty'|trans({}, 'EasyAdminBundle') }}</span>
+                {{ include(entity_config.templates.label_empty) }}
             </div>
         {% endif %}
     {% elseif 'list' == view %}

Resources/views/default/field_json_array.html.twig

@@ -7,7 +7,7 @@
         </ul>
     {% else %}
         <div class="empty collection-empty">
-            <span class="label label-empty">{{ 'label.empty'|trans({}, 'EasyAdminBundle') }}</span>
+            {{ include(entity_config.templates.label_empty) }}
         </div>
     {% endif %}
 {% else %}

Resources/views/default/field_simple_array.html.twig

@@ -7,7 +7,7 @@
         </ul>
     {% else %}
         <div class="empty collection-empty">
-            <span class="label label-empty">{{ 'label.empty'|trans({}, 'EasyAdminBundle') }}</span>
+            {{ include(entity_config.templates.label_empty) }}
         </div>
     {% endif %}
 {% else %}

Resources/views/form/bootstrap_3_layout.html.twig

@@ -353,7 +353,7 @@
 
 {% block empty_collection %}
     <div class="empty collection-empty">
-        <span class="label label-empty">{{ 'label.empty'|trans({}, 'EasyAdminBundle') }}</span>
+        {{ include(easyadmin.entity.templates.label_empty) }}
     </div>
 {% endblock empty_collection %}
 

Twig/EasyAdminTwigExtension.php

@@ -107,7 +107,11 @@ public function renderEntityField(\Twig_Environment $twig, $view, $entityName, $
         try {
             $value = $this->propertyAccessor->getValue($item, $fieldName);
         } catch (\Exception $e) {
-            return $twig->render($entityConfiguration['templates']['label_inaccessible'], array('view' => $view));
+            return $twig->render($entityConfiguration['templates']['label_inaccessible'], array(
+                'view' => $view,
+                'backend_config' => $this->getBackendConfiguration(),
+                'entity_config' => $entityConfiguration,
+            ));
         }
 
         try {
@@ -117,6 +121,8 @@ public function renderEntityField(\Twig_Environment $twig, $view, $entityName, $
                 'item' => $item,
                 'value' => $value,
                 'view' => $view,
+                'backend_config' => $this->getBackendConfiguration(),
+                'entity_config' => $entityConfiguration,
             );
 
             if (null === $value) {

UPGRADE.md

@@ -18,13 +18,17 @@ Upgrade to 2.0.0 (XX/XXX/201X)
 Upgrade to 1.15.X (XX/October/2016)
 -----------------------------------
 
+* The template fragments used to render each property value (e.g.
+  `field_array.html.twig`, `label_null.html.twig`, etc.) now receive two new
+  variables called `entity_config` and `backend_config`, which are useful for
+  advanced backends.
 * The `image` fields and the VichUploader files and images now are rendered
   using the `asset()` Twig function. Depending on your configuration, you may
   need to change or remove EasyAdmin's `base_path` option and define the proper
   base path using Symfony's asset configuration.
 
 Upgrade to 1.13.0 (11/May/2016)
--------------------------------
+---------------------------------
 
 * The configuration of the backend is no longer processed in a compiler pass
   but generated with a cache warmer. This is done to avoid issues with Doctrine