diff --git a/CHANGELOG-5.x.md b/CHANGELOG-5.x.md index 48c87ecf4..64508a400 100644 --- a/CHANGELOG-5.x.md +++ b/CHANGELOG-5.x.md @@ -1,5 +1,10 @@ # Changelog 5.x +## 5.21.2 (2024-09-24) +### Bug Fixes +* fix(admin/environment): picker default name value by @Davidmattei in https://github.com/ems-project/elasticms/pull/1020 +* fix(admin/wysiwyg): file links in fields (edit and revision view) by @theus77 in https://github.com/ems-project/elasticms/pull/1013 + ## 5.21.1 (2024-09-19) ### Bug Fixes * fix(admin/asset-field): asset field remove 'sha1' and '_hash' field by @Davidmattei in https://github.com/ems-project/elasticms/pull/1011 diff --git a/EMS/admin-ui-bundle/src/Resources/views/bootstrap5/components/json_menu_nested/template.twig b/EMS/admin-ui-bundle/src/Resources/views/bootstrap5/components/json_menu_nested/template.twig index 10f38659f..f65aef662 100644 --- a/EMS/admin-ui-bundle/src/Resources/views/bootstrap5/components/json_menu_nested/template.twig +++ b/EMS/admin-ui-bundle/src/Resources/views/bootstrap5/components/json_menu_nested/template.twig @@ -19,6 +19,7 @@ {%- block jmn_title -%}{%- endblock jmn_title -%} {%- block jmn_actions -%} + {% set dropDown = 'left' %} {{ template.block('jmn_button_add', _context)|raw }} {%- endblock jmn_actions -%} @@ -96,7 +97,7 @@ {%- endblock jmn_item_title -%} {%- block jmn_button_item_edit -%} - {{- buttonLabel|default('Edit') -}} + {{- buttonLabel|default('Edit') -}} {%- endblock jmn_button_item_edit -%} {%- block jmn_button_item_delete -%} @@ -108,13 +109,13 @@ {%- endblock jmn_button_item_move -%} {%- block jmn_button_item_view -%} - {{- buttonLabel|default('View') -}} + {{- buttonLabel|default('View') -}} {%- endblock jmn_button_item_view -%} {%- block jmn_button_item_add -%} - + {% if addNode.icon %}{% endif %} - {{- buttonLabel|default("New #{addNode.type}") -}} + {{- buttonLabel|default("New #{addNode.label}") -}} {%- endblock jmn_button_item_add -%} @@ -140,13 +141,12 @@ {% set node = node|default(config.nodes.root) %} {% set addNodes = config.nodes.children(node) %} {% set addMenu = template.block('jmn_button_add_menu', _context)|raw %} - - {% if addNodes|length > 0 or addMenu|length > 0 %} + {% if addNodes|length > 0 and addMenu|length > 0 %} {{- buttonLabel|default('Add') -}} - + {{ addMenu|raw }} @@ -160,7 +160,7 @@ {%- endblock jmn_button_add_menu -%} {%- block jmn_modal_title -%} - {% set modalTitle = modalTitle|default("#{action|capitalize} #{node.type|default('')|capitalize}") %} + {% set modalTitle = modalTitle|default("#{action|capitalize} #{node.label|default}") %} {% if node.icon|default(false) %} {% endif %} {{- modalTitle -}} {%- endblock jmn_modal_title -%} @@ -187,7 +187,7 @@ {%- block jmn_modal_view -%} {%- if dataFields -%} - {%- import "@EMSAdminUI/bootstrap5/macros/data-field-type.html.twig" as macros -%} + {%- import "@EMSCore/macros/data-field-type.html.twig" as macros -%} {{ macros.renderDataField(dataFields, rawData, false, [], config.locale) }} {%- else -%} {{ 'view.data.json-menu-nested-json-preview.field-type-not-found'|trans }} diff --git a/EMS/admin-ui-bundle/src/Resources/views/bootstrap5/datatable/dom.html.twig b/EMS/admin-ui-bundle/src/Resources/views/bootstrap5/datatable/dom.html.twig index 277648f66..df19627a5 100644 --- a/EMS/admin-ui-bundle/src/Resources/views/bootstrap5/datatable/dom.html.twig +++ b/EMS/admin-ui-bundle/src/Resources/views/bootstrap5/datatable/dom.html.twig @@ -1,50 +1,51 @@ {%- use '@EMSAdminUI/bootstrap5/form/forms.html.twig' -%} {% trans_default_domain 'EMSCoreBundle' %} - - - - {% if datatable.supportsTableActions %} - - - - {% endif %} - {% for column in datatable.columns %} - - {% if column.iconClass %} - - {{ column.titleKey|trans }} - {% else %} - {{ column.titleKey|trans }} - {% endif %} - - {% endfor %} - {% if datatable.itemActions|length > 0 %} - {{ 'key.actions'|trans({}, 'emsco-core') }} - {% endif %} - - - - {% for line in datatable %} - + + + + {% if datatable.supportsTableActions %} - - {{ block('emsco_form_table_column_action_checkbox') }} - + + + {% endif %} {% for column in datatable.columns %} - {{ block(column.tableDataBlock()) }} + + {% if column.iconClass %} + + {{ column.titleKey|trans }} + {% else %} + {{ column.titleKey|trans }} + {% endif %} + {% endfor %} {% if datatable.itemActions|length > 0 %} - - {{ block('emsco_form_table_column_row_actions') }} - + {{ 'key.actions'|trans({}, 'emsco-core') }} {% endif %} - {% endfor %} - - - + + + {% for line in datatable %} + + {% if datatable.supportsTableActions %} + + {{ block('emsco_form_table_column_action_checkbox') }} + + {% endif %} + {% for column in datatable.columns %} + {{ block(column.tableDataBlock()) }} + {% endfor %} + {% if datatable.itemActions|length > 0 %} + + {{ block('emsco_form_table_column_row_actions') }} + + {% endif %} + + {% endfor %} + + + {% if datatable.supportsTableActions and datatable.tableMassActions|length > 0%} {% for action in datatable.tableMassActions %} diff --git a/EMS/core-bundle/src/Controller/ContentManagement/DataController.php b/EMS/core-bundle/src/Controller/ContentManagement/DataController.php index 86ae45d61..540c60b6a 100644 --- a/EMS/core-bundle/src/Controller/ContentManagement/DataController.php +++ b/EMS/core-bundle/src/Controller/ContentManagement/DataController.php @@ -833,15 +833,15 @@ public function linkDataAction(string $key, ContentTypeService $ctService): Resp throw new NotFoundHttpException('Impossible to find this item : '.$ouuid); } - if ('asset' == $category) { + if (\in_array($category, ['asset', 'file'])) { if (empty($contentType->getAssetField()) && empty($revision->getRawData()[$contentType->getAssetField()])) { throw new NotFoundHttpException('Asset field not found for '.$revision); } - return $this->redirectToRoute('file.download', [ - 'sha1' => $revision->getRawData()[$contentType->getAssetField()]['sha1'], - 'type' => $revision->getRawData()[$contentType->getAssetField()]['mimetype'], - 'name' => $revision->getRawData()[$contentType->getAssetField()]['filename'], + return $this->redirectToRoute('ems_file_view', [ + 'sha1' => $revision->getRawData()[$contentType->getAssetField()][EmsFields::CONTENT_FILE_HASH_FIELD_] ?? $revision->getRawData()[$contentType->getAssetField()][EmsFields::CONTENT_FILE_HASH_FIELD], + 'type' => $revision->getRawData()[$contentType->getAssetField()][EmsFields::CONTENT_MIME_TYPE_FIELD_] ?? $revision->getRawData()[$contentType->getAssetField()][EmsFields::CONTENT_MIME_TYPE_FIELD], + 'name' => $revision->getRawData()[$contentType->getAssetField()][EmsFields::CONTENT_FILE_NAME_FIELD_] ?? $revision->getRawData()[$contentType->getAssetField()][EmsFields::CONTENT_FILE_NAME_FIELD], ]); } } diff --git a/EMS/core-bundle/src/Core/Component/JsonMenuNested/Config/JsonMenuNestedNode.php b/EMS/core-bundle/src/Core/Component/JsonMenuNested/Config/JsonMenuNestedNode.php index a9851b206..edd32a125 100644 --- a/EMS/core-bundle/src/Core/Component/JsonMenuNested/Config/JsonMenuNestedNode.php +++ b/EMS/core-bundle/src/Core/Component/JsonMenuNested/Config/JsonMenuNestedNode.php @@ -15,6 +15,7 @@ private function __construct( private readonly FieldType $fieldType, public readonly int $id, public readonly string $type, + public readonly string $label, public readonly string $role, public readonly ?string $icon, public readonly array $deny, @@ -33,6 +34,7 @@ public static function fromFieldType(FieldType $fieldType): self $fieldType, $fieldType->getId(), $fieldType->getName(), + $fieldType->getDisplayOption('label', $fieldType->getName()), $fieldType->getMinimumRole(), $fieldType->getDisplayOption('icon', null), $fieldType->getRestrictionOption('json_nested_deny', []), diff --git a/EMS/core-bundle/src/DataTable/Type/Revision/RevisionTrashDataTableType.php b/EMS/core-bundle/src/DataTable/Type/Revision/RevisionTrashDataTableType.php index 3ece254d8..67f1ef7d2 100644 --- a/EMS/core-bundle/src/DataTable/Type/Revision/RevisionTrashDataTableType.php +++ b/EMS/core-bundle/src/DataTable/Type/Revision/RevisionTrashDataTableType.php @@ -45,7 +45,6 @@ public function build(QueryTable $table): void $table ->setIdField('ouuid') ->setLabelAttribute('label') - ->setExtraFrontendOption(['order' => [$this->userService->isSuper() ? 3 : 4, 'desc']]) ->setDefaultOrder('modified', 'desc'); $table->addColumn(t('field.label', [], 'emsco-core'), 'label'); diff --git a/EMS/core-bundle/src/Form/DataField/WysiwygFieldType.php b/EMS/core-bundle/src/Form/DataField/WysiwygFieldType.php index 533f240a8..1519251f4 100644 --- a/EMS/core-bundle/src/Form/DataField/WysiwygFieldType.php +++ b/EMS/core-bundle/src/Form/DataField/WysiwygFieldType.php @@ -8,8 +8,10 @@ use EMS\CoreBundle\Entity\FieldType; use EMS\CoreBundle\Form\Field\AnalyzerPickerType; use EMS\CoreBundle\Form\Field\WysiwygStylesSetPickerType; +use EMS\CoreBundle\Routes; use EMS\CoreBundle\Service\ElasticsearchService; use EMS\CoreBundle\Service\WysiwygStylesSetService; +use EMS\Helpers\Standard\Type; use Symfony\Component\Form\Extension\Core\Type\CheckboxType; use Symfony\Component\Form\Extension\Core\Type\ChoiceType; use Symfony\Component\Form\Extension\Core\Type\IntegerType; @@ -115,13 +117,20 @@ public function configureOptions(OptionsResolver $resolver): void public function reverseViewTransform($data, FieldType $fieldType): DataField { $path = $this->router->generate('ems_file_view', ['sha1' => '__SHA1__'], UrlGeneratorInterface::ABSOLUTE_PATH); - $out = \preg_replace_callback( '/('.\preg_quote(\substr($path, 0, \strlen($path) - 8), '/').')([^\n\r"\'\?]*)/i', fn ($matches) => 'ems://asset:'.$matches[2], $data ); - if (empty($out)) { + + $path = $this->router->generate(Routes::DATA_LINK, ['key' => '__KEY__'], UrlGeneratorInterface::ABSOLUTE_PATH); + $out = \preg_replace_callback( + '/('.\preg_quote(\substr($path, 0, \strlen($path) - 7), '/').')(?P[^\n\r"\'\?]*)/i', + fn ($matches) => 'ems://'.$matches['key'], + $out + ); + + if ('' === $out) { $out = null; } @@ -146,6 +155,12 @@ public function viewTransform(DataField $dataField) fn ($matches) => $path.$matches[2], $out ); + $path = $this->router->generate(Routes::DATA_LINK, ['key' => '__KEY__'], UrlGeneratorInterface::ABSOLUTE_PATH); + $out = \preg_replace_callback( + '/ems:\/\/(?Pfile:([^\n\r"\'\?]*))/i', + fn ($matches) => \str_replace('__KEY__', $matches['key'], $path), + Type::string($out) + ); return $out; } diff --git a/EMS/core-bundle/src/Form/Field/EnvironmentPickerType.php b/EMS/core-bundle/src/Form/Field/EnvironmentPickerType.php index 9fcbe5e22..de0a40795 100644 --- a/EMS/core-bundle/src/Form/Field/EnvironmentPickerType.php +++ b/EMS/core-bundle/src/Form/Field/EnvironmentPickerType.php @@ -11,7 +11,7 @@ class EnvironmentPickerType extends ChoiceType { /** @var array */ - private array $choices = []; + private array $environments = []; public function __construct(private readonly EnvironmentService $service) { @@ -29,7 +29,7 @@ public function getBlockPrefix(): string */ public function buildForm(FormBuilderInterface $builder, array $options): void { - $keys = []; + $choices = []; if ($options['userPublishEnvironments']) { $environments = $this->service->getUserPublishEnvironments()->toArray(); @@ -52,17 +52,17 @@ public function buildForm(FormBuilderInterface $builder, array $options): void foreach ($environments as $env) { if (($env->getManaged() || !$options['managedOnly']) && !\in_array($env->getName(), $options['ignore'], true)) { - $keys[$env->getName()] = $env; - $this->choices[$env->getName()] = $env; + $choices[$env->getName()] = $env; + $this->environments[$env->getName()] = $env; } } - $options['choices'] = $keys; + $options['choices'] = \array_map($options['choice_callback'], $choices); parent::buildForm($builder, $options); } public function configureOptions(OptionsResolver $resolver): void { - $this->choices = []; + $this->environments = []; parent::configureOptions($resolver); $resolver @@ -73,7 +73,7 @@ public function configureOptions(OptionsResolver $resolver): void ], 'choice_attr' => function ($category, $key, $index) { /** @var Environment $dataFieldType */ - $dataFieldType = $this->choices[$index]; + $dataFieldType = $this->environments[$index]; return [ 'data-content' => ' '.$dataFieldType->getLabel().'', @@ -86,6 +86,7 @@ public function configureOptions(OptionsResolver $resolver): void 'defaultEnvironment' => null, 'ignore' => [], 'choice_translation_domain' => false, + 'choice_callback' => fn (Environment $e) => $e->getName(), ]) ->setAllowedTypes('defaultEnvironment', ['null', 'bool']) ; diff --git a/EMS/core-bundle/src/Form/Form/ContentTypeFieldsType.php b/EMS/core-bundle/src/Form/Form/ContentTypeFieldsType.php index c08821022..856a38510 100644 --- a/EMS/core-bundle/src/Form/Form/ContentTypeFieldsType.php +++ b/EMS/core-bundle/src/Form/Form/ContentTypeFieldsType.php @@ -35,7 +35,9 @@ public function buildForm(FormBuilderInterface $builder, array $options): void ->add(ContentTypeFields::CIRCLES, ContentTypeFieldPickerType::class, $defaultOptions) ->add(ContentTypeFields::BUSINESS_ID, ContentTypeFieldPickerType::class, $defaultOptions) ->add(ContentTypeFields::CATEGORY, ContentTypeFieldPickerType::class, $defaultOptions) - ->add(ContentTypeFields::ASSET, ContentTypeFieldPickerType::class, $defaultOptions) + ->add(ContentTypeFields::ASSET, ContentTypeFieldPickerType::class, \array_merge($defaultOptions, [ + 'types' => ['nested'], + ])) ; } diff --git a/EMS/core-bundle/src/Form/Form/ReleaseType.php b/EMS/core-bundle/src/Form/Form/ReleaseType.php index b6566d782..f5d44ec55 100644 --- a/EMS/core-bundle/src/Form/Form/ReleaseType.php +++ b/EMS/core-bundle/src/Form/Form/ReleaseType.php @@ -4,6 +4,7 @@ namespace EMS\CoreBundle\Form\Form; +use EMS\CoreBundle\Entity\Environment; use EMS\CoreBundle\Entity\Release; use EMS\CoreBundle\Form\Field\EnvironmentPickerType; use EMS\CoreBundle\Form\Field\SubmitEmsType; @@ -37,6 +38,7 @@ public function buildForm(FormBuilderInterface $builder, array $options): void 'defaultEnvironment' => false, 'managedOnly' => true, 'label' => t('field.release_environment_target', [], 'emsco-core'), + 'choice_callback' => fn (Environment $environment) => $environment, ]) ->add('execution_date', DateTimeType::class, [ 'required' => false, @@ -55,6 +57,7 @@ public function buildForm(FormBuilderInterface $builder, array $options): void 'defaultEnvironment' => true, 'managedOnly' => true, 'label' => t('field.release_environment_source', [], 'emsco-core'), + 'choice_callback' => fn (Environment $environment) => $environment, ]) ; diff --git a/EMS/core-bundle/src/Resources/views/components/json_menu_nested/template.twig b/EMS/core-bundle/src/Resources/views/components/json_menu_nested/template.twig index 6edb75621..f65aef662 100644 --- a/EMS/core-bundle/src/Resources/views/components/json_menu_nested/template.twig +++ b/EMS/core-bundle/src/Resources/views/components/json_menu_nested/template.twig @@ -19,6 +19,7 @@ {%- block jmn_title -%}{%- endblock jmn_title -%} {%- block jmn_actions -%} + {% set dropDown = 'left' %} {{ template.block('jmn_button_add', _context)|raw }} {%- endblock jmn_actions -%} @@ -96,7 +97,7 @@ {%- endblock jmn_item_title -%} {%- block jmn_button_item_edit -%} - {{- buttonLabel|default('Edit') -}} + {{- buttonLabel|default('Edit') -}} {%- endblock jmn_button_item_edit -%} {%- block jmn_button_item_delete -%} @@ -108,13 +109,13 @@ {%- endblock jmn_button_item_move -%} {%- block jmn_button_item_view -%} - {{- buttonLabel|default('View') -}} + {{- buttonLabel|default('View') -}} {%- endblock jmn_button_item_view -%} {%- block jmn_button_item_add -%} - + {% if addNode.icon %}{% endif %} - {{- buttonLabel|default("New #{addNode.type}") -}} + {{- buttonLabel|default("New #{addNode.label}") -}} {%- endblock jmn_button_item_add -%} @@ -140,13 +141,12 @@ {% set node = node|default(config.nodes.root) %} {% set addNodes = config.nodes.children(node) %} {% set addMenu = template.block('jmn_button_add_menu', _context)|raw %} - - {% if addNodes|length > 0 or addMenu|length > 0 %} + {% if addNodes|length > 0 and addMenu|length > 0 %} {{- buttonLabel|default('Add') -}} - + {{ addMenu|raw }} @@ -160,7 +160,7 @@ {%- endblock jmn_button_add_menu -%} {%- block jmn_modal_title -%} - {% set modalTitle = modalTitle|default("#{action|capitalize} #{node.type|default('')|capitalize}") %} + {% set modalTitle = modalTitle|default("#{action|capitalize} #{node.label|default}") %} {% if node.icon|default(false) %} {% endif %} {{- modalTitle -}} {%- endblock jmn_modal_title -%} diff --git a/EMS/core-bundle/src/Resources/views/datatable/dom.html.twig b/EMS/core-bundle/src/Resources/views/datatable/dom.html.twig index 01321de49..00b3c47f9 100644 --- a/EMS/core-bundle/src/Resources/views/datatable/dom.html.twig +++ b/EMS/core-bundle/src/Resources/views/datatable/dom.html.twig @@ -1,49 +1,51 @@ {%- use '@EMSCore/form/forms.html.twig' -%} {% trans_default_domain 'EMSCoreBundle' %} - - - - {% if datatable.supportsTableActions %} - - - - {% endif %} - {% for column in datatable.columns %} - - {% if column.iconClass %} - - {{ column.titleKey|trans }} - {% else %} - {{ column.titleKey|trans }} - {% endif %} - - {% endfor %} - {% if datatable.itemActions|length > 0 %} - {{ 'key.actions'|trans({}, 'emsco-core') }} - {% endif %} - - - - {% for line in datatable %} - + + + + {% if datatable.supportsTableActions %} - - {{ block('emsco_form_table_column_action_checkbox') }} - + + + {% endif %} {% for column in datatable.columns %} - {{ block(column.tableDataBlock()) }} + + {% if column.iconClass %} + + {{ column.titleKey|trans }} + {% else %} + {{ column.titleKey|trans }} + {% endif %} + {% endfor %} {% if datatable.itemActions|length > 0 %} - - {{ block('emsco_form_table_column_row_actions') }} - + {{ 'key.actions'|trans({}, 'emsco-core') }} {% endif %} - {% endfor %} - - + + + {% for line in datatable %} + + {% if datatable.supportsTableActions %} + + {{ block('emsco_form_table_column_action_checkbox') }} + + {% endif %} + {% for column in datatable.columns %} + {{ block(column.tableDataBlock()) }} + {% endfor %} + {% if datatable.itemActions|length > 0 %} + + {{ block('emsco_form_table_column_row_actions') }} + + {% endif %} + + {% endfor %} + + + {% if datatable.supportsTableActions and datatable.tableMassActions|length > 0%} diff --git a/EMS/core-bundle/src/Twig/AppExtension.php b/EMS/core-bundle/src/Twig/AppExtension.php index 61ab6283c..3f848f331 100644 --- a/EMS/core-bundle/src/Twig/AppExtension.php +++ b/EMS/core-bundle/src/Twig/AppExtension.php @@ -41,6 +41,7 @@ use EMS\CoreBundle\Service\SearchService; use EMS\CoreBundle\Service\UserService; use EMS\Helpers\Standard\Color; +use EMS\Helpers\Standard\Type; use Psr\Log\LoggerInterface; use Ramsey\Uuid\Uuid; use Symfony\Component\Form\FormError; @@ -794,7 +795,7 @@ public function srcPath(string $input, bool $asFileName = false): ?string $path = $this->router->generate('ems_file_view', ['sha1' => '__SHA1__'], UrlGeneratorInterface::ABSOLUTE_PATH); $path = \substr($path, 0, \strlen($path) - 8); - return \preg_replace_callback( + $out = \preg_replace_callback( '/(ems:\/\/asset:)(?P[^\n\r"\'\?]*)(?:\?(?P(?:[^\n\r"|\']*)))?/i', function ($matches) use ($path, $asFileName) { if ($asFileName) { @@ -822,6 +823,14 @@ function ($matches) use ($path, $asFileName) { }, $input ); + $path = $this->router->generate(Routes::DATA_LINK, ['key' => '__KEY__'], UrlGeneratorInterface::ABSOLUTE_PATH); + $out = \preg_replace_callback( + '/ems:\/\/(?Pfile:([^\n\r"\'\?]*))/i', + fn ($matches) => \str_replace('__KEY__', $matches['key'], $path), + Type::string($out) + ); + + return $out; } public function internalLinks(string $input, bool $asFileName = false): ?string diff --git a/demo/configs/admin/content-type/media_file.json b/demo/configs/admin/content-type/media_file.json index a7314ebeb..c28275f6b 100644 --- a/demo/configs/admin/content-type/media_file.json +++ b/demo/configs/admin/content-type/media_file.json @@ -617,7 +617,7 @@ "circles": null, "business_id": null, "category": null, - "asset": null + "asset": "media_file" }, "settings": { "tasks_enabled": false, diff --git a/elasticms-admin/composer.lock b/elasticms-admin/composer.lock index cd608588f..63d3a0097 100644 --- a/elasticms-admin/composer.lock +++ b/elasticms-admin/composer.lock @@ -2015,7 +2015,7 @@ }, { "name": "elasticms/admin-ui-bundle", - "version": "5.21.1", + "version": "5.21.2", "source": { "type": "git", "url": "https://github.com/ems-project/EMSAdminUIBundle.git", @@ -2054,13 +2054,13 @@ "ui" ], "support": { - "source": "https://github.com/ems-project/EMSAdminUIBundle/tree/5.21.1" + "source": "https://github.com/ems-project/EMSAdminUIBundle/tree/5.21.2" }, "time": "2024-09-17T16:50:57+00:00" }, { "name": "elasticms/client-helper-bundle", - "version": "5.21.1", + "version": "5.21.2", "source": { "type": "git", "url": "https://github.com/ems-project/EMSClientHelperBundle.git", @@ -2112,13 +2112,13 @@ "elasticms" ], "support": { - "source": "https://github.com/ems-project/EMSClientHelperBundle/tree/5.21.1" + "source": "https://github.com/ems-project/EMSClientHelperBundle/tree/5.21.2" }, "time": "2024-09-12T15:27:14+00:00" }, { "name": "elasticms/common-bundle", - "version": "5.21.1", + "version": "5.21.2", "source": { "type": "git", "url": "https://github.com/ems-project/EMSCommonBundle.git", @@ -2205,22 +2205,22 @@ "elasticms" ], "support": { - "source": "https://github.com/ems-project/EMSCommonBundle/tree/5.21.1" + "source": "https://github.com/ems-project/EMSCommonBundle/tree/5.21.2" }, "time": "2024-09-12T15:27:14+00:00" }, { "name": "elasticms/core-bundle", - "version": "5.21.1", + "version": "5.21.2", "source": { "type": "git", "url": "https://github.com/ems-project/EMSCoreBundle.git", - "reference": "23fbbaa4463c3882488a5ad6e954dde37f36ffb1" + "reference": "d51c085f56041bba961592fdec18ba4812c4611a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ems-project/EMSCoreBundle/zipball/23fbbaa4463c3882488a5ad6e954dde37f36ffb1", - "reference": "23fbbaa4463c3882488a5ad6e954dde37f36ffb1", + "url": "https://api.github.com/repos/ems-project/EMSCoreBundle/zipball/d51c085f56041bba961592fdec18ba4812c4611a", + "reference": "d51c085f56041bba961592fdec18ba4812c4611a", "shasum": "" }, "require": { @@ -2279,13 +2279,13 @@ "elasticms" ], "support": { - "source": "https://github.com/ems-project/EMSCoreBundle/tree/5.21.1" + "source": "https://github.com/ems-project/EMSCoreBundle/tree/5.21.2" }, - "time": "2024-09-19T14:07:18+00:00" + "time": "2024-09-24T12:25:13+00:00" }, { "name": "elasticms/form-bundle", - "version": "5.21.1", + "version": "5.21.2", "source": { "type": "git", "url": "https://github.com/ems-project/EMSFormBundle.git", @@ -2331,13 +2331,13 @@ "elasticms" ], "support": { - "source": "https://github.com/ems-project/EMSFormBundle/tree/5.21.1" + "source": "https://github.com/ems-project/EMSFormBundle/tree/5.21.2" }, "time": "2024-09-12T15:27:14+00:00" }, { "name": "elasticms/helpers", - "version": "5.21.1", + "version": "5.21.2", "source": { "type": "git", "url": "https://github.com/ems-project/helpers.git", @@ -2393,13 +2393,13 @@ "php" ], "support": { - "source": "https://github.com/ems-project/helpers/tree/5.21.1" + "source": "https://github.com/ems-project/helpers/tree/5.21.2" }, "time": "2024-09-03T07:45:27+00:00" }, { "name": "elasticms/submission-bundle", - "version": "5.21.1", + "version": "5.21.2", "source": { "type": "git", "url": "https://github.com/ems-project/EMSSubmissionBundle.git", @@ -2448,13 +2448,13 @@ "elasticms" ], "support": { - "source": "https://github.com/ems-project/EMSSubmissionBundle/tree/5.21.1" + "source": "https://github.com/ems-project/EMSSubmissionBundle/tree/5.21.2" }, "time": "2024-09-12T15:27:14+00:00" }, { "name": "elasticms/xliff", - "version": "5.21.1", + "version": "5.21.2", "source": { "type": "git", "url": "https://github.com/ems-project/xliff.git", @@ -2508,7 +2508,7 @@ "xliff" ], "support": { - "source": "https://github.com/ems-project/xliff/tree/5.21.1" + "source": "https://github.com/ems-project/xliff/tree/5.21.2" }, "time": "2024-09-12T15:27:14+00:00" }, diff --git a/elasticms-cli/composer.lock b/elasticms-cli/composer.lock index bfd42432f..63b45aec7 100644 --- a/elasticms-cli/composer.lock +++ b/elasticms-cli/composer.lock @@ -1750,7 +1750,7 @@ }, { "name": "elasticms/common-bundle", - "version": "5.21.1", + "version": "5.21.2", "source": { "type": "git", "url": "https://github.com/ems-project/EMSCommonBundle.git", @@ -1837,13 +1837,13 @@ "elasticms" ], "support": { - "source": "https://github.com/ems-project/EMSCommonBundle/tree/5.21.1" + "source": "https://github.com/ems-project/EMSCommonBundle/tree/5.21.2" }, "time": "2024-09-12T15:27:14+00:00" }, { "name": "elasticms/helpers", - "version": "5.21.1", + "version": "5.21.2", "source": { "type": "git", "url": "https://github.com/ems-project/helpers.git", @@ -1899,7 +1899,7 @@ "php" ], "support": { - "source": "https://github.com/ems-project/helpers/tree/5.21.1" + "source": "https://github.com/ems-project/helpers/tree/5.21.2" }, "time": "2024-09-03T07:45:27+00:00" }, diff --git a/elasticms-web/composer.lock b/elasticms-web/composer.lock index 48c66193a..7cc8eb572 100644 --- a/elasticms-web/composer.lock +++ b/elasticms-web/composer.lock @@ -1997,7 +1997,7 @@ }, { "name": "elasticms/client-helper-bundle", - "version": "5.21.1", + "version": "5.21.2", "source": { "type": "git", "url": "https://github.com/ems-project/EMSClientHelperBundle.git", @@ -2049,13 +2049,13 @@ "elasticms" ], "support": { - "source": "https://github.com/ems-project/EMSClientHelperBundle/tree/5.21.1" + "source": "https://github.com/ems-project/EMSClientHelperBundle/tree/5.21.2" }, "time": "2024-09-12T15:27:14+00:00" }, { "name": "elasticms/common-bundle", - "version": "5.21.1", + "version": "5.21.2", "source": { "type": "git", "url": "https://github.com/ems-project/EMSCommonBundle.git", @@ -2142,13 +2142,13 @@ "elasticms" ], "support": { - "source": "https://github.com/ems-project/EMSCommonBundle/tree/5.21.1" + "source": "https://github.com/ems-project/EMSCommonBundle/tree/5.21.2" }, "time": "2024-09-12T15:27:14+00:00" }, { "name": "elasticms/form-bundle", - "version": "5.21.1", + "version": "5.21.2", "source": { "type": "git", "url": "https://github.com/ems-project/EMSFormBundle.git", @@ -2194,13 +2194,13 @@ "elasticms" ], "support": { - "source": "https://github.com/ems-project/EMSFormBundle/tree/5.21.1" + "source": "https://github.com/ems-project/EMSFormBundle/tree/5.21.2" }, "time": "2024-09-12T15:27:14+00:00" }, { "name": "elasticms/helpers", - "version": "5.21.1", + "version": "5.21.2", "source": { "type": "git", "url": "https://github.com/ems-project/helpers.git", @@ -2256,13 +2256,13 @@ "php" ], "support": { - "source": "https://github.com/ems-project/helpers/tree/5.21.1" + "source": "https://github.com/ems-project/helpers/tree/5.21.2" }, "time": "2024-09-03T07:45:27+00:00" }, { "name": "elasticms/submission-bundle", - "version": "5.21.1", + "version": "5.21.2", "source": { "type": "git", "url": "https://github.com/ems-project/EMSSubmissionBundle.git", @@ -2311,7 +2311,7 @@ "elasticms" ], "support": { - "source": "https://github.com/ems-project/EMSSubmissionBundle/tree/5.21.1" + "source": "https://github.com/ems-project/EMSSubmissionBundle/tree/5.21.2" }, "time": "2024-09-12T15:27:14+00:00" },
{{ 'view.data.json-menu-nested-json-preview.field-type-not-found'|trans }}