diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merged branch pierredup/hinclude (PR #5993)

Browse Source 
This PR was merged into the master branch.

Commits
-------

74a8fcf [FrameworkBundle] Added support for default templates per render tag

Discussion
----------

[FrameworkBundle] Added support for default templates per render tag

This commit allows you to specify default templates per render tag when using hinclude.

E.G:
The following will use the specific default template for the render:
```` {% render "AcmeDemoBundle:Controller:action" with {}, {"standalone" : "js", "default" : "AcmeDemoBundle:Default:content.html.twig"} %}````

or if you don't want to use a template for the default content but just a string, you can do the following
```` {% render "AcmeDemoBundle:Controller:action" with {}, {"standalone" : "js", "default" : "Loading..."} %}````

Bug fix: no
Feature addition: yes
Backwards compatibility break: no
Fixes the following tickets: #3356
Todo: -
Documentation

---------------------------------------------------------------------------

by fabpot at 2012-12-14T12:25:40Z

Looks good to me. Can you add a note in the CHANGELOG of the component and send a PR on symfony/symfony-docs about this new feature? Thanks.

---------------------------------------------------------------------------

by pierredup at 2012-12-14T14:30:00Z

@fabpot done, documentation PR symfony/symfony-docs#2021
This commit is contained in:
Fabien Potencier 2012-12-14 21:10:00 +01:00
commit 1017f34001
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
View File

@ -10,6 +10,7 @@ CHANGELOG
* A new parameter has been added to the DIC: `router.request_context.base_url` * A new parameter has been added to the DIC: `router.request_context.base_url`
You can customize it for your functional tests or for generating urls with You can customize it for your functional tests or for generating urls with
the right base url when your are in the cli context. the right base url when your are in the cli context.
* Added support for default templates per render tag
2.1.0 2.1.0
----- -----

15
src/Symfony/Bundle/FrameworkBundle/HttpKernel.php
View File

@ -105,6 +105,7 @@ class HttpKernel extends BaseHttpKernel
'alt' => array(), 'alt' => array(),
'standalone' => false, 'standalone' => false,
'comment' => '', 'comment' => '',
'default' => null,
), $options); ), $options);
if (!is_array($options['alt'])) { if (!is_array($options['alt'])) {
@ -130,8 +131,16 @@ class HttpKernel extends BaseHttpKernel
$uri = $this->generateInternalUri($controller, $options['attributes'], $options['query'], false); $uri = $this->generateInternalUri($controller, $options['attributes'], $options['query'], false);
$defaultContent = null; $defaultContent = null;
if ($template = $this->container->getParameter('templating.hinclude.default_template')) { $templating = $this->container->get('templating');
$defaultContent = $this->container->get('templating')->render($template);
if ($options['default']) {
if ($templating->exists($options['default'])) {
$defaultContent = $templating->render($options['default']);
} else {
$defaultContent = $options['default'];
}
} elseif ($template = $this->container->getParameter('templating.hinclude.default_template')) {
$defaultContent = $templating->render($template);
} }
return $this->renderHIncludeTag($uri, $defaultContent); return $this->renderHIncludeTag($uri, $defaultContent);
@ -226,7 +235,7 @@ class HttpKernel extends BaseHttpKernel
/** /**
* Renders an HInclude tag. * Renders an HInclude tag.
* *
* @param string $uri A URI * @param string $uri A URI
* @param string $defaultContent Default content * @param string $defaultContent Default content
*/ */
public function renderHIncludeTag($uri, $defaultContent = null) public function renderHIncludeTag($uri, $defaultContent = null)