diff --git a/src/Bundle/ChillDocGeneratorBundle/Controller/AdminDocGeneratorTemplateController.php b/src/Bundle/ChillDocGeneratorBundle/Controller/AdminDocGeneratorTemplateController.php index f1db9e16f..57d4cd487 100644 --- a/src/Bundle/ChillDocGeneratorBundle/Controller/AdminDocGeneratorTemplateController.php +++ b/src/Bundle/ChillDocGeneratorBundle/Controller/AdminDocGeneratorTemplateController.php @@ -27,6 +27,29 @@ class AdminDocGeneratorTemplateController extends CRUDController $this->contextManager = $contextManager; } + public function generateTemplateParameter(string $action, $entity, Request $request, array $defaultTemplateParameters = []) + { + switch ($action) { + case 'new': + $context = $this->contextManager->getContextByKey($request->get('context')); + + break; + + case 'edit': + $context = $this->contextManager->getContextByDocGeneratorTemplate($entity); + + break; + + default: + return parent::generateTemplateParameter($action, $entity, $request, $defaultTemplateParameters); // TODO: Change the autogenerated stub + } + + return array_merge( + $defaultTemplateParameters, + ['context' => $context] + ); + } + public function new(Request $request): Response { if (!$request->query->has('context')) { @@ -59,23 +82,4 @@ class AdminDocGeneratorTemplateController extends CRUDController return $entity; } - - function generateTemplateParameter(string $action, $entity, Request $request, array $defaultTemplateParameters = []) - { - switch ($action) { - case 'new': - $context = $this->contextManager->getContextByKey($request->get('context')); - break; - case 'edit': - $context = $this->contextManager->getContextByDocGeneratorTemplate($entity); - break; - default: - return parent::generateTemplateParameter($action, $entity, $request, $defaultTemplateParameters); // TODO: Change the autogenerated stub - } - - return array_merge( - $defaultTemplateParameters, - ['context' => $context] - ); - } } diff --git a/src/Bundle/ChillDocGeneratorBundle/Controller/DocGeneratorTemplateController.php b/src/Bundle/ChillDocGeneratorBundle/Controller/DocGeneratorTemplateController.php index 02f164a78..2a175eb27 100644 --- a/src/Bundle/ChillDocGeneratorBundle/Controller/DocGeneratorTemplateController.php +++ b/src/Bundle/ChillDocGeneratorBundle/Controller/DocGeneratorTemplateController.php @@ -115,7 +115,7 @@ final class DocGeneratorTemplateController extends AbstractController } elseif (!$form->isSubmitted() || ($form->isSubmitted() && !$form->isValid())) { $templatePath = '@ChillDocGenerator/Generator/basic_form.html.twig'; $templateOptions = ['entity' => $entity, 'form' => $form->createView(), - 'template' => $template, 'context' => $context]; + 'template' => $template, 'context' => $context, ]; return $this->render($templatePath, $templateOptions); } diff --git a/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodContext.php b/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodContext.php index 136cb751b..5bc218ce9 100644 --- a/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodContext.php +++ b/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodContext.php @@ -110,7 +110,7 @@ class AccompanyingPeriodContext implements ]) ->add('person1', CheckboxType::class, [ 'required' => false, - 'label' => 'Ask for person 1' + 'label' => 'Ask for person 1', ]) ->add('person1Label', TextType::class, [ 'label' => 'person 1 label', @@ -118,7 +118,7 @@ class AccompanyingPeriodContext implements ]) ->add('person2', CheckboxType::class, [ 'required' => false, - 'label' => 'Ask for person 2' + 'label' => 'Ask for person 2', ]) ->add('person2Label', TextType::class, [ 'label' => 'person 2 label', @@ -155,7 +155,7 @@ class AccompanyingPeriodContext implements 'choice_label' => function (Person $p) { return $this->personRender->renderString($p, []); }, 'multiple' => false, 'expanded' => true, - 'label' => $options[$key.'Label'], + 'label' => $options[$key . 'Label'], ]); } }