diff --git a/.changes/unreleased/Fixed-20231124-121854.yaml b/.changes/unreleased/Fixed-20231124-121854.yaml new file mode 100644 index 000000000..912e5d3cd --- /dev/null +++ b/.changes/unreleased/Fixed-20231124-121854.yaml @@ -0,0 +1,5 @@ +kind: Fixed +body: Fix rendering of custom fields +time: 2023-11-24T12:18:54.023062767+01:00 +custom: + Issue: "222" diff --git a/.changes/unreleased/Fixed-20231124-122955.yaml b/.changes/unreleased/Fixed-20231124-122955.yaml new file mode 100644 index 000000000..f7410b6ae --- /dev/null +++ b/.changes/unreleased/Fixed-20231124-122955.yaml @@ -0,0 +1,5 @@ +kind: Fixed +body: Fix various errors in custom fields administration +time: 2023-11-24T12:29:55.417513892+01:00 +custom: + Issue: "" diff --git a/src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldController.php b/src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldController.php index f96c25909..00e377bde 100644 --- a/src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldController.php +++ b/src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldController.php @@ -30,7 +30,7 @@ class CustomFieldController extends AbstractController /** * Creates a new CustomField entity. * - * @Route("/{_locale}/admin/customfield/new", name="customfield_new") + * @Route("/{_locale}/admin/customfield/new", name="customfield_create") */ public function createAction(Request $request) { diff --git a/src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldsGroupController.php b/src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldsGroupController.php index 829ca5c55..a8e77d059 100644 --- a/src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldsGroupController.php +++ b/src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldsGroupController.php @@ -232,7 +232,7 @@ class CustomFieldsGroupController extends AbstractController /** * Finds and displays a CustomFieldsGroup entity. * - * @Route("/{_locale}/admin/customfieldsgroup/{id}/show", name="customfieldsgroup/show") + * @Route("/{_locale}/admin/customfieldsgroup/{id}/show", name="customfieldsgroup_show") */ public function showAction(mixed $id) { @@ -256,7 +256,7 @@ class CustomFieldsGroupController extends AbstractController /** * Edits an existing CustomFieldsGroup entity. * - * @Route("/{_locale}/admin/customfieldsgroup/{id}/update", name="customfieldsgroup/update") + * @Route("/{_locale}/admin/customfieldsgroup/{id}/update", name="customfieldsgroup_update") */ public function updateAction(Request $request, mixed $id) { @@ -383,7 +383,7 @@ class CustomFieldsGroupController extends AbstractController $em = $this->getDoctrine()->getManager(); $customFieldsGroupIds = $em->createQuery('SELECT g.id FROM ' - .'ChillCustomFieldsBundle:CustomFieldsDefaultGroup d ' + .CustomFieldsDefaultGroup::class.' d ' .'JOIN d.customFieldsGroup g') ->getResult(Query::HYDRATE_SCALAR); diff --git a/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldChoice.php b/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldChoice.php index 8fd91f27d..a83c241d8 100644 --- a/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldChoice.php +++ b/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldChoice.php @@ -280,7 +280,7 @@ class CustomFieldChoice extends AbstractCustomField $template = '@ChillCustomFields/CustomFieldsRendering/choice.html.twig'; if ('csv' === $documentType) { - $template = 'ChillCustomFieldsBundle:CustomFieldsRendering:choice.csv.twig'; + $template = 'ChillCustomFieldsBundle/CustomFieldsRendering/choice.csv.twig'; } return $this->templating diff --git a/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldDate.php b/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldDate.php index a535f805e..dac447930 100644 --- a/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldDate.php +++ b/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldDate.php @@ -68,7 +68,7 @@ class CustomFieldDate extends AbstractCustomField { $validatorFunction = static function ($value, ExecutionContextInterface $context) { try { - $date = new \DateTime($value); + $date = new \DateTime((string) $value); } catch (\Exception) { $context->buildViolation('The expression "%expression%" is invalid', [ '%expression%' => $value, @@ -125,7 +125,7 @@ class CustomFieldDate extends AbstractCustomField return $date->format('Y-m-d'); default: - $template = 'ChillCustomFieldsBundle:CustomFieldsRendering:date.' + $template = '@ChillCustomFields/CustomFieldsRendering/date.' .$documentType.'.twig'; return $this->templating diff --git a/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldLongChoice.php b/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldLongChoice.php index 885a02f2d..54d63b978 100644 --- a/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldLongChoice.php +++ b/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldLongChoice.php @@ -96,7 +96,7 @@ class CustomFieldLongChoice extends AbstractCustomField public function render($value, CustomField $customField, $documentType = 'html') { $option = $this->deserialize($value, $customField); - $template = 'ChillCustomFieldsBundle:CustomFieldsRendering:choice_long.' + $template = '@ChillCustomFields/CustomFieldsRendering/choice_long.' .$documentType.'.twig'; return $this->templating diff --git a/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldNumber.php b/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldNumber.php index 979d96540..e083b9b80 100644 --- a/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldNumber.php +++ b/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldNumber.php @@ -95,7 +95,7 @@ class CustomFieldNumber extends AbstractCustomField public function render($value, CustomField $customField, $documentType = 'html') { - $template = 'ChillCustomFieldsBundle:CustomFieldsRendering:number.' + $template = '@ChillCustomFields/CustomFieldsRendering/number.' .$documentType.'.twig'; $options = $customField->getOptions(); diff --git a/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldText.php b/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldText.php index f95048e21..17d8e95e7 100644 --- a/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldText.php +++ b/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldText.php @@ -89,7 +89,7 @@ class CustomFieldText extends AbstractCustomField $template = '@ChillCustomFields/CustomFieldsRendering/text.html.twig'; if ('csv' === $documentType) { - $template = 'ChillCustomFieldsBundle:CustomFieldsRendering:text.csv.twig'; + $template = '@ChillCustomFields/CustomFieldsRendering/text.csv.twig'; } return $this->templating diff --git a/src/Bundle/ChillCustomFieldsBundle/Form/CustomFieldType.php b/src/Bundle/ChillCustomFieldsBundle/Form/CustomFieldType.php index 9ffc157cc..23a7ed975 100644 --- a/src/Bundle/ChillCustomFieldsBundle/Form/CustomFieldType.php +++ b/src/Bundle/ChillCustomFieldsBundle/Form/CustomFieldType.php @@ -11,6 +11,7 @@ declare(strict_types=1); namespace Chill\CustomFieldsBundle\Form; +use Chill\CustomFieldsBundle\Entity\CustomFieldsGroup; use Chill\CustomFieldsBundle\Form\DataTransformer\CustomFieldsGroupToIdTransformer; use Chill\CustomFieldsBundle\Service\CustomFieldProvider; use Chill\MainBundle\Form\Type\TranslatableStringFormType; @@ -45,7 +46,7 @@ class CustomFieldType extends AbstractType if ('entity' === $options['group_widget']) { $builder->add('customFieldsGroup', EntityType::class, [ - 'class' => 'ChillCustomFieldsBundle:CustomFieldsGroup', + 'class' => CustomFieldsGroup::class, 'choice_label' => fn ($g) => $this->translatableStringHelper->localize($g->getName()), ]); } elseif ('hidden' === $options['group_widget']) { diff --git a/src/Bundle/ChillCustomFieldsBundle/config/services/controller.yaml b/src/Bundle/ChillCustomFieldsBundle/config/services/controller.yaml index e57828e5f..2a25ea048 100644 --- a/src/Bundle/ChillCustomFieldsBundle/config/services/controller.yaml +++ b/src/Bundle/ChillCustomFieldsBundle/config/services/controller.yaml @@ -1,4 +1,8 @@ services: + _defaults: + autowire: true + autoconfigure: true + Chill\CustomFieldsBundle\Controller\: resource: '../../Controller' tags: ['controller.service_arguments']