Merge remote-tracking branch 'origin/master' into feat/add-document-encrypter-service

This commit is contained in:
2022-04-26 09:37:30 +02:00
329 changed files with 5953 additions and 2055 deletions

View File

@@ -26,6 +26,7 @@ use Doctrine\ORM\EntityManagerInterface;
use Exception;
use Psr\Log\LoggerInterface;
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
use Symfony\Component\Form\Extension\Core\Type\FileType;
use Symfony\Component\HttpFoundation\File\File;
use Symfony\Component\HttpFoundation\RedirectResponse;
@@ -221,14 +222,14 @@ final class DocGeneratorTemplateController extends AbstractController
$builder = $this->createFormBuilder(
array_merge(
$context->getFormData($template, $entity),
$isTest ? ['test_file' => null] : []
$isTest ? ['test_file' => null, 'show_data' => false] : []
)
);
$context->buildPublicForm($builder, $template, $entity);
} else {
$builder = $this->createFormBuilder(
['test_file' => null]
['test_file' => null, 'show_data' => false]
);
}
@@ -237,6 +238,10 @@ final class DocGeneratorTemplateController extends AbstractController
'label' => 'Template file',
'required' => false,
]);
$builder->add('show_data', CheckboxType::class, [
'label' => 'Show data instead of generating',
'required' => false,
]);
}
$form = $builder->getForm()->handleRequest($request);
@@ -266,6 +271,11 @@ final class DocGeneratorTemplateController extends AbstractController
}
}
if ($isTest && isset($form) && $form['show_data']->getData()) {
// very ugly hack...
dd($datas);
}
try {
$generatedResource = $this
->driver