EZEE-3191: Fixed incomplete draft transition through Workflow with pu…

…blish action (#27)
ezsystems · Jun 22, 2020 · e448709 · e448709
1 parent 3c0d036
commit e448709
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 2 deletions.
diff --git a/src/lib/Content/View/Builder/AbstractContentViewBuilder.php b/src/lib/Content/View/Builder/AbstractContentViewBuilder.php
@@ -8,6 +8,7 @@
 
 namespace EzSystems\EzPlatformContentForms\Content\View\Builder;
 
+use eZ\Publish\API\Repository\ContentService;
 use eZ\Publish\API\Repository\Repository;
 use eZ\Publish\API\Repository\Values\Content\Language;
 use eZ\Publish\API\Repository\Values\Content\Location;
@@ -46,14 +47,18 @@ abstract class AbstractContentViewBuilder
     /** @var \eZ\Publish\Core\Helper\FieldsGroups\FieldsGroupsList */
     private $fieldsGroupsList;
 
+    /** @var \eZ\Publish\API\Repository\ContentService */
+    protected $contentService;
+
     public function __construct(
         Repository $repository,
         Configurator $viewConfigurator,
         ParametersInjector $viewParametersInjector,
         ActionDispatcherInterface $contentActionDispatcher,
         UserLanguagePreferenceProviderInterface $languagePreferenceProvider,
         ConfigResolverInterface $configResolver,
-        FieldsGroupsList $fieldsGroupsList
+        FieldsGroupsList $fieldsGroupsList,
+        ContentService $contentService
     ) {
         $this->repository = $repository;
         $this->viewConfigurator = $viewConfigurator;
@@ -62,6 +67,7 @@ public function __construct(
         $this->languagePreferenceProvider = $languagePreferenceProvider;
         $this->configResolver = $configResolver;
         $this->fieldsGroupsList = $fieldsGroupsList;
+        $this->contentService = $contentService;
     }
 
     /**

diff --git a/src/lib/Content/View/Builder/ContentEditViewBuilder.php b/src/lib/Content/View/Builder/ContentEditViewBuilder.php
@@ -17,6 +17,7 @@
 use eZ\Publish\Core\MVC\Symfony\View\Builder\ViewBuilder;
 use EzSystems\EzPlatformContentForms\Content\View\ContentEditSuccessView;
 use EzSystems\EzPlatformContentForms\Content\View\ContentEditView;
+use Symfony\Component\Form\FormError;
 
 /**
  * Builds ContentEditView objects.
@@ -89,6 +90,22 @@ public function buildView(array $parameters)
             }
         }
 
+        if ($parameters['validate'] && !$form->isSubmitted()) {
+            $validationErrors = $this->contentService->validate(
+                $content->getVersionInfo(), [
+                    'content' => $content,
+                ]
+            );
+
+            foreach ($validationErrors as $fieldIdentifier => $validationErrorLanguages) {
+                foreach ($validationErrorLanguages as $languageCode => $validationError) {
+                    $form->get('fieldsData')->get($fieldIdentifier)->get('value')->addError(new FormError(
+                        (string)$validationError->getTranslatableMessage()
+                    ));
+                }
+            }
+        }
+
         $view->setContent($content);
         $view->setLanguage($language);
         $view->setLocation($location);

diff --git a/src/lib/Content/View/Filter/ContentEditViewFilter.php b/src/lib/Content/View/Filter/ContentEditViewFilter.php
@@ -92,7 +92,10 @@ public function handleContentEditForm(FilterViewBuilderParametersEvent $event)
             $contentDraft
         );
 
-        $event->getParameters()->add(['form' => $form->handleRequest($request)]);
+        $event->getParameters()->add([
+            'form' => $form->handleRequest($request),
+            'validate' => (bool)$request->get('validate', false),
+        ]);
     }
 
     /**