Merge pull request #58 from ezsystems/IBX-1852-field-group-user

IBX-1852: Added grouped_fields to edit/create user content
ezsystems · Jan 17, 2022 · 9d904b3 · 9d904b3
2 parents 5f42a2c + 46c72ea
commit 9d904b3
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/src/bundle/Controller/UserController.php b/src/bundle/Controller/UserController.php
@@ -26,6 +26,7 @@
 use EzSystems\EzPlatformContentForms\Form\Type\User\UserUpdateType;
 use EzSystems\EzPlatformContentForms\User\View\UserCreateView;
 use EzSystems\EzPlatformContentForms\User\View\UserUpdateView;
+use Ibexa\Contracts\ContentForms\Content\Form\Provider\GroupedContentFormFieldsProviderInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\OptionsResolver\Exception\AccessException;
@@ -59,14 +60,18 @@ class UserController extends Controller
     /** @var \eZ\Publish\Core\MVC\Symfony\Locale\UserLanguagePreferenceProviderInterface */
     private $userLanguagePreferenceProvider;
 
+    /** @var \Ibexa\Contracts\ContentForms\Content\Form\Provider\GroupedContentFormFieldsProviderInterface */
+    private $groupedContentFormFieldsProvider;
+
     public function __construct(
         ContentTypeService $contentTypeService,
         UserService $userService,
         LocationService $locationService,
         LanguageService $languageService,
         ActionDispatcherInterface $userActionDispatcher,
         PermissionResolver $permissionResolver,
-        UserLanguagePreferenceProviderInterface $userLanguagePreferenceProvider
+        UserLanguagePreferenceProviderInterface $userLanguagePreferenceProvider,
+        GroupedContentFormFieldsProviderInterface $groupedContentFormFieldsProvider
     ) {
         $this->contentTypeService = $contentTypeService;
         $this->userService = $userService;
@@ -75,6 +80,7 @@ public function __construct(
         $this->userActionDispatcher = $userActionDispatcher;
         $this->permissionResolver = $permissionResolver;
         $this->userLanguagePreferenceProvider = $userLanguagePreferenceProvider;
+        $this->groupedContentFormFieldsProvider = $groupedContentFormFieldsProvider;
     }
 
     /**
@@ -135,6 +141,9 @@ public function createAction(
                 'parent_location' => $location,
                 'content_type' => $contentType,
                 'parent_group' => $parentGroup,
+                'grouped_fields' => $this->groupedContentFormFieldsProvider->getGroupedFields(
+                    $form->get('fieldsData')->all()
+                ),
             ]
         );
     }
@@ -218,6 +227,9 @@ public function editAction(
                 'user' => $user,
                 'location' => $location,
                 'parent_location' => $parentLocation,
+                'grouped_fields' => $this->groupedContentFormFieldsProvider->getGroupedFields(
+                    $form->get('fieldsData')->all()
+                ),
             ]
         );
     }

diff --git a/src/bundle/Resources/config/services.yaml b/src/bundle/Resources/config/services.yaml
@@ -134,6 +134,7 @@ services:
             - "@ezplatform.content_forms.action_dispatcher.user"
             - '@eZ\Publish\API\Repository\PermissionResolver'
             - '@eZ\Publish\Core\MVC\Symfony\Locale\UserLanguagePreferenceProvider'
+            - '@Ibexa\ContentForms\Content\Form\Provider\GroupedContentFormFieldsProvider'
         parent: ezpublish.controller.base
         tags:
               - { name: controller.service_arguments }