Merge pull request #7 from styleflasher/admin-ui-integration

make content types containing enhancedbinaryfile field type(s) editable in ezplatform admin ui

Author: emodric

bundle/Core/FieldType/EnhancedBinaryFile/FormMapper.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace Netgen\Bundle\EnhancedBinaryFileBundle\Core\FieldType\EnhancedBinaryFile;
+
+use EzSystems\RepositoryForms\Data\FieldDefinitionData;
+use EzSystems\RepositoryForms\FieldType\FieldDefinitionFormMapperInterface;
+use EzSystems\RepositoryForms\FieldType\Mapper\BinaryFileFormMapper;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
+use Symfony\Component\Form\FormInterface;
+
+class FormMapper extends BinaryFileFormMapper
+{
+    public function mapFieldDefinitionForm(FormInterface $fieldDefinitionForm, FieldDefinitionData $data)
+    {
+        parent::mapFieldDefinitionForm($fieldDefinitionForm, $data);
+
+        $fieldDefinitionForm
+            ->add(
+                'allowedTypes',
+                TextType::class,
+                [
+                    'required' => false,
+                    'property_path' => 'fieldSettings[allowedTypes]',
+                    'label' => 'field_definition.enhancedbinaryfile.allowedTypes',
+                    'translation_domain' => 'messages',
+                ]
+            );
+    }
+}

bundle/Core/Persistence/Legacy/Content/FieldValue/Converter/Converter.php

@@ -62,7 +62,7 @@ public function toFieldDefinition(StorageFieldDefinition $storageDef, FieldDefin
                     'FileSizeValidator' => array(
                         'maxFileSize' => (0 !== $storageDef->dataInt1
                             ? $storageDef->dataInt1
-                            : false),
+                            : null),
                     ),
                 ),
                 'fieldSettings' => new FieldSettings(array(

bundle/DependencyInjection/NetgenEnhancedBinaryFileExtension.php

@@ -3,12 +3,31 @@
 namespace Netgen\Bundle\EnhancedBinaryFileBundle\DependencyInjection;
 
 use Symfony\Component\Config\FileLocator;
+use Symfony\Component\Config\Resource\FileResource;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
 use Symfony\Component\DependencyInjection\Loader;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
+use Symfony\Component\Yaml\Yaml;
 
-class NetgenEnhancedBinaryFileExtension extends Extension
+class NetgenEnhancedBinaryFileExtension extends Extension implements PrependExtensionInterface
 {
+    /**
+     * Preprend ezpublish configuration to make the field templates
+     * visibile to the admin template engine
+     *
+     * @param ContainerBuilder $container
+     */
+    public function prepend( ContainerBuilder $container )
+    {
+        $fileName = "ez_field_templates.yml";
+        $configFile = __DIR__ . '/../Resources/config/' . $fileName;
+        $config = Yaml::parse(file_get_contents($configFile));
+
+        $container->prependExtensionConfig("ezpublish", $config);
+        $container->addResource(new FileResource($configFile));
+    }
+
     /**
      * {@inheritdoc}
      */

bundle/Form/FieldTypeHandler/EnhancedFile.php

@@ -8,6 +8,7 @@
 use eZ\Publish\SPI\FieldType\Value;
 use Netgen\Bundle\EzFormsBundle\Form\FieldTypeHandler;
 use Netgen\Bundle\EnhancedBinaryFileBundle\Core\FieldType\EnhancedBinaryFile\Value as EnhancedFileValue;
+use Symfony\Component\Form\Extension\Core\Type\FileType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 use Symfony\Component\Validator\Constraints;
@@ -68,10 +69,10 @@ protected function buildFieldForm(
         $maxFileSize = $fieldDefinition->validatorConfiguration['FileSizeValidator']['maxFileSize'];
         $allowedExtensions = $fieldDefinition->fieldSettings['allowedTypes'];
 
-        if (false !== $maxFileSize || !empty($allowedExtensions)) {
+        if (null !== $maxFileSize || !empty($allowedExtensions)) {
             $constraints = array();
 
-            if (false !== $maxFileSize && !empty($maxFileSize)) {
+            if (null !== $maxFileSize && !empty($maxFileSize)) {
                 $constraints['maxSize'] = strval($maxFileSize) . "M";
             }
 
@@ -94,6 +95,6 @@ protected function buildFieldForm(
         // EnhancedBinaryFile should not be erased (updated as empty) if nothing is selected in file input
         $this->skipEmptyUpdate($formBuilder, $fieldDefinition->identifier);
 
-        $formBuilder->add($fieldDefinition->identifier, 'file', $options);
+        $formBuilder->add($fieldDefinition->identifier, FileType::class, $options);
     }
 }

bundle/Resources/config/ez_field_templates.yml

@@ -0,0 +1,6 @@
+system:
+    default:
+        fielddefinition_edit_templates:
+            - template: "NetgenEnhancedBinaryFileBundle:admin:field_types.html.twig"
+        field_templates:
+            - template: "NetgenEnhancedBinaryFileBundle:content_fields.html.twig"

bundle/Resources/config/fieldtypes.yml

@@ -12,3 +12,11 @@ services:
         class: eZ\Publish\Core\FieldType\BinaryFile\BinaryFileStorage\Gateway\LegacyStorage
         tags:
             - { name: ezpublish.fieldType.externalStorageHandler.gateway, alias: enhancedezbinaryfile, identifier: LegacyStorage }
+
+    ezpublish.fieldType.enhancedezbinaryfile.form_mapper:
+        class: Netgen\Bundle\EnhancedBinaryFileBundle\Core\FieldType\EnhancedBinaryFile\FormMapper
+        arguments:
+            - "@ezpublish.api.service.field_type"
+            - "@ezrepoforms.config_resolver.max_upload_size"
+        tags:
+            - { name: ez.fieldFormMapper.definition, fieldType: enhancedezbinaryfile }

bundle/Resources/translations/messages.de.yml

@@ -0,0 +1 @@
+field_definition.enhancedbinaryfile.allowedTypes: Erlaubte Dateiformate (komma-separiert)

bundle/Resources/translations/messages.en.yml

@@ -0,0 +1 @@
+field_definition.enhancedbinaryfile.allowedTypes: Allowed file types (comma separated)

bundle/Resources/views/admin/field_types.html.twig

@@ -0,0 +1,14 @@
+{% extends 'EzSystemsRepositoryFormsBundle:ContentType:field_types.html.twig' %}
+{% block enhancedezbinaryfile_field_definition_edit %}
+    <div class="enhancedezbinaryfile-validator max-file-size{% if group_class is not empty %} {{ group_class }}{% endif %}">
+        {{- form_label(form.maxSize) -}}
+        {{- form_errors(form.maxSize) -}}
+        {{- form_widget(form.maxSize) -}}
+    </div>
+
+    <div class="enhancedezbinaryfile-validator allowed-file-types{% if group_class is not empty %} {{ group_class }}{% endif %}">
+        {{- form_label(form.allowedTypes) -}}
+        {{- form_errors(form.allowedTypes) -}}
+        {{- form_widget(form.allowedTypes) -}}
+    </div>
+{% endblock %}

bundle/Resources/views/content_fields.html.twig

@@ -0,0 +1,4 @@
+{% extends "EzPublishCoreBundle::content_fields.html.twig" %}
+{% block enhancedbinaryfile_field %}
+    {{ block('ezbinaryfile_field') }}
+{% endblock %}