EZP-29290: As an Editor, I want to have preconfigured "Author" sectio…

…n while creating the content
ezsystems · Aug 13, 2018 · 5133add · 5133add
1 parent 7135170
commit 5133add
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/lib/FieldType/Mapper/AuthorFormMapper.php b/lib/FieldType/Mapper/AuthorFormMapper.php
@@ -35,8 +35,8 @@ public function mapFieldDefinitionForm(FormInterface $fieldDefinitionForm, Field
                 ChoiceType::class,
                 [
                     'choices' => [
+                        'field_definition.ezauthor.default_user_empty' => Type::DEFAULT_VALUE_EMPTY,
                         'field_definition.ezauthor.default_user_current' => Type::DEFAULT_CURRENT_USER,
-                        'field_definition.ezauthor.default_user_empty' => Type::DEFAULT_EMPTY,
                     ],
                     'choices_as_values' => true,
                     'expanded' => true,

diff --git a/lib/Form/Type/FieldType/AuthorFieldType.php b/lib/Form/Type/FieldType/AuthorFieldType.php
@@ -8,6 +8,7 @@
 
 use eZ\Publish\API\Repository\Exceptions\NotFoundException;
 use eZ\Publish\API\Repository\Repository;
+use eZ\Publish\Core\FieldType\Author\Type as AuthorType;
 use eZ\Publish\Core\FieldType\Author\Author;
 use eZ\Publish\Core\FieldType\Author\Value;
 use EzSystems\RepositoryForms\Form\Type\FieldType\Author\AuthorCollectionType;
@@ -87,7 +88,7 @@ public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults([
             'data_class' => Value::class,
-            'default_author' => 1,
+            'default_author' => AuthorType::DEFAULT_VALUE_EMPTY,
         ])->setAllowedTypes('default_author', 'integer');
     }
 
@@ -100,10 +101,10 @@ public function getViewTransformer(): DataTransformerInterface
     {
         return new CallbackTransformer(function (Value $value) {
             if (0 === $value->authors->count()) {
-                if ($this->defaultAuthor === -1) {
-                    $value->authors->append(new Author());
-                } else {
+                if ($this->defaultAuthor === AuthorType::DEFAULT_CURRENT_USER) {
                     $value->authors->append($this->fetchLoggedAuthor());
+                } else {
+                    $value->authors->append(new Author());
                 }
             }