Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make sure sets inside collections are instantiated with actual values #1520

Merged
merged 1 commit into from
Jun 19, 2020
Merged

Make sure sets inside collections are instantiated with actual values #1520

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/Event/Listener/FieldFillListener.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,11 @@ public function postLoad(LifecycleEventArgs $args): void
public function fillSet(SetField $entity): void
{
$definition = $entity->getDefinition();
$fields = $this->intersectFieldsAndDefinition($this->fields->findAllByParent($entity), $definition);
$fields = $this->fields->findAllByParent($entity);

/** @var Field $field */
foreach ($fields as $field) {
$definition = $entity->getDefinition()->get('fields')[$field->getName()] ?? new Collection();
$definition = $definition->get('fields')[$field->getName()] ?? new Collection();
$field->setDefinition($field->getName(), $definition);
}

Expand Down
2 changes: 1 addition & 1 deletion templates/_partials/fields/image.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{% extends '@bolt/_partials/fields/_base.html.twig' %}

{% set extensions = field.definition.get('extensions')|default('') %}
{% set extensions = field.definition.get('extensions')|default([]) %}
{% set info %}
{{ 'upload.allow_file_types'|trans }}: <code>{{ extensions|join('</code>, <code>') }}</code><br>
{{ 'upload.max_size'|trans }}: {{ config.maxupload|format_bytes }}
Expand Down