EZP-24361: Added a base template to render field blocks

ezsystems · May 19, 2015 · 08d0e45 · pspanja · May 19, 2015 · lolautruche
1 parent 0b53f74
commit 08d0e45
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 15 deletions.
diff --git a/eZ/Bundle/EzPublishCoreBundle/Resources/config/templating.yml b/eZ/Bundle/EzPublishCoreBundle/Resources/config/templating.yml
@@ -123,12 +123,9 @@ services:
 
     ezpublish.templating.field_block_renderer.twig:
         class: %ezpublish.templating.field_block_renderer.twig.class%
-        arguments:
-            - @ezpublish.api.service.content_type
-            - @ezpublish.fieldType.parameterProviderRegistry
-            - @ezpublish.translation_helper
         calls:
             - [setTwig, [@twig]]
+            - [setBaseTemplate, [%ezpublish.content_view.viewbase_layout%]]
             - [setFieldViewResources, ["$field_templates$"]]
             - [setFieldEditResources, ["$field_edit_templates$"]]
             - [setFieldDefinitionViewResources, ["$fielddefinition_settings_templates$"]]

diff --git a/...re/MVC/Symfony/Templating/Tests/Twig/Extension/FieldRenderingExtensionIntegrationTest.php b/...re/MVC/Symfony/Templating/Tests/Twig/Extension/FieldRenderingExtensionIntegrationTest.php
@@ -28,6 +28,7 @@ public function getExtensions()
         $configResolver = $this->getConfigResolverMock();
 
         $fieldBlockRenderer = new FieldBlockRenderer();
+        $fieldBlockRenderer->setBaseTemplate($this->getTemplatePath('base.html.twig'));
         $fieldBlockRenderer->setFieldViewResources(
             array(
                 array(

diff --git a/eZ/Publish/Core/MVC/Symfony/Templating/Twig/FieldBlockRenderer.php b/eZ/Publish/Core/MVC/Symfony/Templating/Twig/FieldBlockRenderer.php
@@ -68,11 +68,11 @@ class FieldBlockRenderer implements FieldBlockRendererInterface
     private $fieldDefinitionEditResources = [];
 
     /**
-     * A \Twig_Template instance used to render template blocks.
+     * A \Twig_Template instance used to render template blocks, or path to the template to use.
      *
-     * @var Twig_Template
+     * @var Twig_Template|string
      */
-    private $template;
+    private $baseTemplate;
 
     /**
      * Template blocks
@@ -89,6 +89,14 @@ public function setTwig( Twig_Environment $twig )
         $this->twig = $twig;
     }
 
+    /**
+     * @param string|Twig_Template $baseTemplate
+     */
+    public function setBaseTemplate($baseTemplate)
+    {
+        $this->baseTemplate = $baseTemplate;
+    }
+
     /**
      * @param array $fieldViewResources
      */
@@ -162,13 +170,12 @@ private function renderContentField( Field $field, $fieldTypeIdentifier, array $
         $params += ['field' => $field];
 
         // Getting instance of Twig_Template that will be used to render blocks
-        if ( !$this->template instanceof Twig_Template )
+        if ( is_string( $this->baseTemplate ) )
         {
-            $tpl = reset( $this->fieldViewResources );
-            $this->template = $this->twig->loadTemplate( $tpl['template'] );
+            $this->baseTemplate = $this->twig->loadTemplate( $this->baseTemplate );
         }
 
-        return $this->template->renderBlock(
+        return $this->baseTemplate->renderBlock(
             $this->getRenderFieldBlockName( $fieldTypeIdentifier, $type ),
             $params,
             $this->getBlocksByField( $fieldTypeIdentifier, $type, $localTemplate )
@@ -194,18 +201,17 @@ public function renderFieldDefinitionEdit( FieldDefinition $fieldDefinition, arr
      */
     private function renderFieldDefinition( FieldDefinition $fieldDefinition, array $params, $type )
     {
-        if ( !$this->template instanceof Twig_Template )
+        if ( is_string( $this->baseTemplate ) )
         {
-            $tpl = reset( $this->fieldDefinitionViewResources );
-            $this->template = $this->twig->loadTemplate( $tpl['template'] );
+            $this->baseTemplate = $this->twig->loadTemplate( $this->baseTemplate );
         }
 
         $params += [
             'fielddefinition' => $fieldDefinition,
             'settings' => $fieldDefinition->getFieldSettings(),
         ];
 
-        return $this->template->renderBlock(
+        return $this->baseTemplate->renderBlock(
             $this->getRenderFieldDefinitionBlockName( $fieldDefinition->fieldTypeIdentifier, $type ),
             $params,
             $this->getBlocksByFieldDefinition( $fieldDefinition, $type )