Merge pull request #253 from ezsystems/revert-226-language_filtering

Revert "EZP-28598: Fixes no filtering langauge on create content UI"
ezsystems · Dec 21, 2017 · 925b196 · 925b196
2 parents 813b530 + 32eb0f7
commit 925b196
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 104 deletions.
diff --git a/src/bundle/Resources/config/services.yml b/src/bundle/Resources/config/services.yml
@@ -4,13 +4,13 @@ imports:
     - { resource: services/tabs.yml }
     - { resource: services/menu.yml }
     - { resource: services/application_config.yml }
+    - { resource: services/type_extensions.yml }
     - { resource: services/pagination.yml }
     - { resource: services/ui_config.yml }
     - { resource: services/components.yml }
     - { resource: services/dashboard.yml }
     - { resource: services/modules/subitems.yml }
     - { resource: services/form_processors.yml }
-    - { resource: services/form_types.yml }
 
 parameters:
 
@@ -44,6 +44,9 @@ services:
         tags:
             - {name: kernel.event_subscriber}
 
+    EzSystems\EzPlatformAdminUi\Form\Type\:
+        resource: '../../../lib/Form/Type'
+
     EzSystems\EzPlatformAdminUi\Form\DataMapper\:
         resource: '../../../lib/Form/DataMapper'
 

diff --git a/src/bundle/Resources/config/services/form_types.yml b/src/bundle/Resources/config/services/form_types.yml
diff --git a/src/bundle/Resources/config/services/type_extensions.yml b/src/bundle/Resources/config/services/type_extensions.yml
@@ -0,0 +1,5 @@
+services:
+    _defaults:
+        autowire: true
+        autoconfigure: true
+        public: true
diff --git a/src/lib/Form/Type/Content/Draft/ContentCreateType.php b/src/lib/Form/Type/Content/Draft/ContentCreateType.php
@@ -12,7 +12,7 @@
 use EzSystems\EzPlatformAdminUi\Form\Data\Content\Draft\ContentCreateData;
 use EzSystems\EzPlatformAdminUi\Form\Type\Content\LocationType;
 use EzSystems\EzPlatformAdminUi\Form\Type\ContentType\ContentTypeChoiceType;
-use EzSystems\EzPlatformAdminUi\Form\Type\Language\LimitedLanguageChoiceType;
+use EzSystems\EzPlatformAdminUi\Form\Type\Language\LanguageChoiceType;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Symfony\Component\Form\FormBuilderInterface;
@@ -50,7 +50,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             )
             ->add(
                 'language',
-                LimitedLanguageChoiceType::class,
+                LanguageChoiceType::class,
                 [
                     'label' => false,
                     'multiple' => false,

diff --git a/src/lib/Form/Type/Language/LimitedLanguageChoiceType.php b/src/lib/Form/Type/Language/LimitedLanguageChoiceType.php