diff --git a/Block/ContentList.php b/Block/ContentList.php index d969d5b..0bfa7bd 100644 --- a/Block/ContentList.php +++ b/Block/ContentList.php @@ -30,7 +30,7 @@ public function __construct(ListableManager $listableManager, RequestStack $requ $this->requestStack = $requestStack; } - public function getTemplate(Block $block) : string + public function getTemplate(Block $block): string { $config = $block->getConfiguration(); @@ -40,8 +40,8 @@ public function getTemplate(Block $block) : string return sprintf('blocks/%s.html.twig', $this->getType()); } - - public function getType() : string + + public function getType(): string { return 'content_list'; } @@ -49,11 +49,11 @@ public function getType() : string public function execute(Block $block) { $config = $block->getConfiguration(); - $pageParameterName = $config['page_parameter_name'] ?? 'page_'.$block->getId(); + $pageParameterName = $config['page_parameter_name'] ?? 'page_' . $block->getId(); try { $pagerfanta = $this->listableManager->getContents( - $block, + $block, $this->requestStack->getCurrentRequest()->get($pageParameterName, 1) ); } catch (OutOfRangeCurrentPageException $e) { @@ -74,7 +74,7 @@ public function createAdminConfigurationForm(FormBuilderInterface $builder) $this->listableManager->getListableEntities() ), ]); - + $builder->add('template', ChoiceType::class, [ 'choices' => array_combine( $this->listableManager->getListableEntitiesTemplates(), @@ -95,10 +95,15 @@ public function createAdminConfigurationForm(FormBuilderInterface $builder) 'required' => false, ]); - $builder->add('filters', TextareaType::class); + $builder->add('filters', TextareaType::class, [ + 'required' => false, + ]); + $builder->add('limit', NumberType::class); - $builder->add('page_parameter_name'); + $builder->add('page_parameter_name', [ + 'required' => false, + ]); } public function configure(NodeDefinition $rootNode)