Skip to content
This repository was archived by the owner on Sep 16, 2021. It is now read-only.

fix ignored settings #205

Merged
merged 3 commits into from
Aug 18, 2014
Merged

fix ignored settings #205

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e4bb376
dirty hack to fix ignored settings
Aug 8, 2014
c3d1f9d
merge settings using OptionsResolver
Aug 9, 2014
8e84af2
added whitespace around = sign
Aug 11, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 13 additions & 4 deletions Block/ContainerBlockService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
use Symfony\Bundle\FrameworkBundle\Templating\EngineInterface;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\OptionsResolver\OptionsResolverInterface;
use Symfony\Component\OptionsResolver\OptionsResolver;

class ContainerBlockService extends BaseBlockService implements BlockServiceInterface
{
Expand Down Expand Up @@ -76,10 +77,18 @@ public function execute(BlockContextInterface $blockContext, Response $response
$response = new Response();
}

if ($blockContext->getBlock()->getEnabled()) {
return $this->renderResponse($blockContext->getTemplate(), array(
'block' => $blockContext->getBlock(),
'settings' => $blockContext->getSettings(),
$block = $blockContext->getBlock();

// merge block settings with default settings
$settings = $blockContext->getSettings();
$resolver = new OptionsResolver();
$resolver->setDefaults($settings);
$settings = $resolver->resolve($block->getSettings());

if ($block->getEnabled()) {
return $this->renderResponse($settings['template'], array(
'block' => $block,
'settings' => $settings,
), $response);
}

Expand Down