Code clean up >= Sulu 1.5 (#98)

* Removed not needed js component * Implemented AuthorBehavior * Fixed bug * Fixed PHPDocs
sulu · Mar 14, 2017 · ce4fe65 · ce4fe65
1 parent 46584a4
commit ce4fe65
Show file tree

Hide file tree

Showing 12 changed files with 22 additions and 248 deletions.
diff --git a/Controller/ArticleController.php b/Controller/ArticleController.php
@@ -218,12 +218,6 @@ public function postAction(Request $request)
         $locale = $this->getRequestParameter($request, 'locale', true);
         $data = $request->request->all();
 
-        $document->setAuthored(new \DateTime());
-        if (array_key_exists('authored', $data)) {
-            $document->setAuthored(new \DateTime($data['authored']));
-        }
-        $document->setAuthor($this->getAuthor($data));
-
         $this->persistDocument($data, $document, $locale);
         $this->handleActionParameter($action, $document, $locale);
         $this->getDocumentManager()->flush();
@@ -260,11 +254,6 @@ public function putAction(Request $request, $uuid)
 
         $this->get('sulu_hash.request_hash_checker')->checkHash($request, $document, $document->getUuid());
 
-        if (array_key_exists('authored', $data)) {
-            $document->setAuthored(new \DateTime($data['authored']));
-        }
-        $document->setAuthor($this->getAuthor($data));
-
         $this->persistDocument($data, $document, $locale);
         $this->handleActionParameter($action, $document, $locale);
         $this->getDocumentManager()->flush();
@@ -412,22 +401,6 @@ private function persistDocument($data, $document, $locale)
         );
     }
 
-    /**
-     * Returns author or current user.
-     *
-     * @param array $data
-     *
-     * @return int
-     */
-    private function getAuthor(array $data)
-    {
-        if (!array_key_exists('author', $data)) {
-            return $this->getUser()->getContact()->getId();
-        }
-
-        return $data['author'];
-    }
-
     /**
      * Returns document-manager.
      *

diff --git a/Document/ArticleDocument.php b/Document/ArticleDocument.php
@@ -14,6 +14,7 @@
 use Sulu\Bundle\ArticleBundle\Document\Behavior\DateShardingBehavior;
 use Sulu\Bundle\RouteBundle\Model\RoutableInterface;
 use Sulu\Bundle\RouteBundle\Model\RouteInterface;
+use Sulu\Component\Content\Document\Behavior\AuthorBehavior;
 use Sulu\Component\Content\Document\Behavior\ExtensionBehavior;
 use Sulu\Component\Content\Document\Behavior\LocalizedAuditableBehavior;
 use Sulu\Component\Content\Document\Behavior\LocalizedStructureBehavior;
@@ -46,7 +47,8 @@ class ArticleDocument implements
     RoutableInterface,
     ExtensionBehavior,
     WorkflowStageBehavior,
-    VersionBehavior
+    VersionBehavior,
+    AuthorBehavior
 {
     /**
      * @var string
@@ -421,51 +423,35 @@ public function getPublished()
     }
 
     /**
-     * Set authored.
-     *
-     * @param \DateTime $authored
-     *
-     * @return $this
+     * {@inheritdoc}
      */
-    public function setAuthored(\DateTime $authored = null)
+    public function getAuthored()
     {
-        $this->authored = $authored;
-
-        return $this;
+        return $this->authored;
     }
 
     /**
-     * Returns date-time of authoring this article.
-     *
-     * @return \DateTime
+     * {@inheritdoc}
      */
-    public function getAuthored()
+    public function setAuthored($authored)
     {
-        return $this->authored;
+        $this->authored = $authored;
     }
 
     /**
-     * Returns id of author.
-     *
-     * @return int
+     * {@inheritdoc}
      */
     public function getAuthor()
     {
         return $this->author;
     }
 
     /**
-     * Sets id of author.
-     *
-     * @param int $author
-     *
-     * @return $this
+     * {@inheritdoc}
      */
     public function setAuthor($author)
     {
         $this->author = $author;
-
-        return $this;
     }
 
     /**

diff --git a/Document/Form/ArticleDocumentType.php b/Document/Form/ArticleDocumentType.php
@@ -12,6 +12,7 @@
 namespace Sulu\Bundle\ArticleBundle\Document\Form;
 
 use Sulu\Bundle\ContentBundle\Form\Type\AbstractStructureBehaviorType;
+use Symfony\Component\Form\Extension\Core\Type\DateType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
@@ -36,6 +37,12 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         $builder->add('resourceSegment', TextType::class, ['mapped' => false]);
         $builder->add('navigationContexts', TextType::class, ['mapped' => false]);
         $builder->add('shadowLocaleEnabled', TextType::class, ['mapped' => false]);
+        $builder->add(
+            'authored',
+            DateType::class,
+            ['widget' => 'single_text', 'model_timezone' => 'UTC', 'view_timezone' => 'UTC']
+        );
+        $builder->add('author', TextType::class);
     }
 
     /**

diff --git a/Document/Subscriber/ArticleSubscriber.php b/Document/Subscriber/ArticleSubscriber.php
@@ -339,20 +339,6 @@ public function handleMetadataLoad(MetadataLoadEvent $event)
                 'property' => 'routePath',
             ]
         );
-        $metadata->addFieldMapping(
-            'authored',
-            [
-                'encoding' => 'system_localized',
-                'property' => 'authored',
-            ]
-        );
-        $metadata->addFieldMapping(
-            'author',
-            [
-                'encoding' => 'system_localized',
-                'property' => 'author',
-            ]
-        );
     }
 
     /**

diff --git a/Resources/public/dist/components/articles/edit/settings/author-selection/main.js b/Resources/public/dist/components/articles/edit/settings/author-selection/main.js