diff --git a/src/new/src/PSC/Shop/MediaBundle/Document/MediaItem.php b/src/new/src/PSC/Shop/MediaBundle/Document/MediaItem.php index f698099de..421344cc7 100644 --- a/src/new/src/PSC/Shop/MediaBundle/Document/MediaItem.php +++ b/src/new/src/PSC/Shop/MediaBundle/Document/MediaItem.php @@ -1,6 +1,7 @@ media = new ArrayCollection(); + } public function getUid() { return $this->uid; diff --git a/src/new/src/PSC/Shop/NewsBundle/Form/Backend/NewsType.php b/src/new/src/PSC/Shop/NewsBundle/Form/Backend/NewsType.php index cb1760884..c32f592e6 100755 --- a/src/new/src/PSC/Shop/NewsBundle/Form/Backend/NewsType.php +++ b/src/new/src/PSC/Shop/NewsBundle/Form/Backend/NewsType.php @@ -14,6 +14,7 @@ namespace PSC\Shop\NewsBundle\Form\Backend; use PSC\Libraries\AceEditorBundle\Form\Extension\CKEditor5Type; +use PSC\Shop\MediaBundle\Form\MediaForm; use PSC\System\PluginBundle\Form\Chain\Field; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\Extension\Core\Type\CheckboxType; @@ -27,6 +28,7 @@ use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\Form\FormEvent; use Symfony\Component\Form\FormEvents; use Symfony\Component\OptionsResolver\OptionsResolver; +use Symfony\UX\LiveComponent\Form\Type\LiveCollectionType; class NewsType extends AbstractType { @@ -55,8 +57,8 @@ class NewsType extends AbstractType 'Englisch' => 'en_EN' ], 'required' => true]) - ->add('todoItems', LiveCollectionType::class, [ - 'entry_type' => MediaItemForm::class, + ->add('media', LiveCollectionType::class, [ + 'entry_type' => MediaForm::class, 'entry_options' => ['label' => 'media'], 'label' => false, 'allow_add' => true, diff --git a/src/new/src/PSC/Shop/NewsBundle/Resources/views/backend/edit/edit.html.twig b/src/new/src/PSC/Shop/NewsBundle/Resources/views/backend/edit/edit.html.twig index 4eebdec76..5628af257 100755 --- a/src/new/src/PSC/Shop/NewsBundle/Resources/views/backend/edit/edit.html.twig +++ b/src/new/src/PSC/Shop/NewsBundle/Resources/views/backend/edit/edit.html.twig @@ -37,6 +37,12 @@ {{ 'Text'|trans }} + + + + + + {{ 'Media'|trans }} {% for customGroup in customGroups %} @@ -71,6 +77,14 @@ {{ form_row(form.language)}} + + + {{ form_row(form.fromDate)}} + + + {{ form_row(form.toDate)}} + + {{ form_row(form.introduction)}} @@ -78,6 +92,33 @@ {{ form_widget(form.text) }} + + + + + + Name + Description + + + + {% for media_form in form.media %} + + + {{ form_row(media_form.name) }} + + + {{ form_row(media_form.description) }} + + + {{ form_row(media_form.vars.button_delete, {label: 'X', attr: {class: 'btn btn-outline-danger'}}) }} + + + {% endfor %} + + + {{ form_widget(form.media.vars.button_add, {label: '+ Add Media', attr: {class: 'btn btn-outline-primary'}}) }} + {% for customGroup in customGroups %} {% for customField in customFields %}