admin/core
1
0
Fork 0
mirror of https://github.com/jbcr/core.git synced 2026-03-31 05:12:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1464 from bolt/bugfix/intersect-child-fields-with-definition

Browse Source 
Intersect child fields with parent definition
This commit is contained in:
Bob den Otter
2020-06-10 16:25:49 +02:00
committed by GitHub
parent c0bb6d863a d1dc85b88d
commit 2599aecfac
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/Event/Listener/FieldFillListener.php
View File

@@ -4,6 +4,7 @@ declare(strict_types=1);
namespace Bolt\Event\Listener;
use Bolt\Configuration\Content\FieldType;
use Bolt\Entity\Field;
use Bolt\Entity\Field\CollectionField;
use Bolt\Entity\Field\SetField;
@@ -43,7 +44,8 @@ class FieldFillListener
public function fillSet(SetField $entity): void
{
$fields = $this->fields->findAllByParent($entity);
$definition = $entity->getDefinition();
$fields = $this->intersectFieldsAndDefinition($this->fields->findAllByParent($entity), $definition);
/** @var Field $field */
foreach ($fields as $field) {
@@ -56,14 +58,22 @@ class FieldFillListener
public function fillCollection(CollectionField $entity): void
{
$fields = $this->fields->findAllByParent($entity);
$definition = $entity->getDefinition();
$fields = $this->intersectFieldsAndDefinition($this->fields->findAllByParent($entity), $definition);
/** @var Field $field */
foreach ($fields as $field) {
$definition = $entity->getDefinition()->get('fields')[$field->getName()] ?? new Collection();
$field->setDefinition($field->getName(), $definition);
$fieldDefiniton = $entity->getDefinition()->get('fields')[$field->getName()] ?? new Collection();
$field->setDefinition($field->getName(), $fieldDefiniton);
}
$entity->setValue($fields);
}
private function intersectFieldsAndDefinition(array $fields, FieldType $definition): array
{
return collect($fields)->filter(function (Field $field) use ($definition) {
return $definition->get('fields')->has($field->getName());
})->toArray();
}
}