Merge pull request #13 from sulu/feature/authored-date

added authored date and settings tab

Admin/ArticleContententNavigationProvider.php

@@ -43,6 +43,13 @@ public function getNavigationItems(array $options = [])
         $excerpt->setComponent('articles/edit/excerpt@suluarticle');
         $excerpt->setDisplay(['edit']);
 
-        return [$details, $seo, $excerpt];
+        $settings = new ContentNavigationItem('content-navigation.contents.settings');
+        $settings->setId('settings');
+        $settings->setPosition(40);
+        $settings->setAction('settings');
+        $settings->setComponent('articles/edit/settings@suluarticle');
+        $settings->setDisplay(['edit']);
+
+        return [$details, $seo, $excerpt, $settings];
     }
 }

Controller/ArticleController.php

@@ -24,7 +24,6 @@
 use Sulu\Component\Rest\Exception\MissingParameterException;
 use Sulu\Component\Rest\ListBuilder\FieldDescriptor;
 use Sulu\Component\Rest\ListBuilder\ListRepresentation;
-use Sulu\Component\Rest\ListBuilder\ListRestHelper;
 use Sulu\Component\Rest\RequestParametersTrait;
 use Sulu\Component\Rest\RestController;
 use Symfony\Component\HttpFoundation\Request;
@@ -77,7 +76,7 @@ public function cgetFieldsAction()
      */
     public function cgetAction(Request $request)
     {
-        $restHelper = new ListRestHelper($request);
+        $restHelper = $this->get('sulu_core.list_rest_helper');
 
         /** @var Manager $manager */
         $manager = $this->get('es.manager.default');
@@ -269,6 +268,11 @@ private function persistDocument($data, $document, $locale)
         );
         $form->submit($data, false);
 
+        if (array_key_exists('authored', $data)) {
+            $document->setAuthored(new \DateTime($data['authored']));
+        }
+        $document->setAuthors($this->getAuthors($data));
+
         if (!$form->isValid()) {
             throw new InvalidFormException($form);
         }
@@ -283,6 +287,22 @@ private function persistDocument($data, $document, $locale)
         );
     }
 
+    /**
+     * Returns authors or current user.
+     *
+     * @param array $data
+     *
+     * @return int[]
+     */
+    private function getAuthors(array $data)
+    {
+        if (!array_key_exists('authors', $data)) {
+            return [$this->getUser()->getContact()->getId()];
+        }
+
+        return $data['authors'];
+    }
+
     /**
      * Returns document-manager.
      *

Document/ArticleDocument.php

@@ -141,6 +141,20 @@ class ArticleDocument implements
      */
     protected $published;
 
+    /**
+     * Timestamp of authoring (can be set by user).
+     *
+     * @var \DateTime
+     */
+    protected $authored;
+
+    /**
+     * Array of contact-ids which has authored this article.
+     *
+     * @var int[]
+     */
+    protected $authors = [];
+
     public function __construct()
     {
         $this->structure = new Structure();
@@ -399,4 +413,52 @@ public function getPublished()
     {
         return $this->published;
     }
+
+    /**
+     * Set authored date-time.
+     *
+     * @param \DateTime $authored
+     *
+     * @return $this
+     */
+    public function setAuthored(\DateTime $authored = null)
+    {
+        $this->authored = $authored;
+
+        return $this;
+    }
+
+    /**
+     * Returns date-time of authoring this article.
+     *
+     * @return \DateTime
+     */
+    public function getAuthored()
+    {
+        return $this->authored;
+    }
+
+    /**
+     * Returns id of authors.
+     *
+     * @return int[]
+     */
+    public function getAuthors()
+    {
+        return $this->authors;
+    }
+
+    /**
+     * Set authors.
+     *
+     * @param int[] $authors
+     *
+     * @return $this
+     */
+    public function setAuthors($authors)
+    {
+        $this->authors = $authors;
+
+        return $this;
+    }
 }

Document/ArticleOngrDocument.php

@@ -93,6 +93,20 @@ class ArticleOngrDocument
      */
     protected $seo;
 
+    /**
+     * @var \DateTime
+     *
+     * @Property(type="date")
+     */
+    protected $authored;
+
+    /**
+     * @var int[]
+     *
+     * @Property(type="integer")
+     */
+    protected $authors;
+
     /**
      * @param string $uuid
      */
@@ -340,4 +354,52 @@ public function setSeo($seo)
 
         return $this;
     }
+
+    /**
+     * Returns authored.
+     *
+     * @return \DateTime
+     */
+    public function getAuthored()
+    {
+        return $this->authored;
+    }
+
+    /**
+     * Set authored date.
+     *
+     * @param \DateTime $authored
+     *
+     * @return $this
+     */
+    public function setAuthored(\DateTime $authored = null)
+    {
+        $this->authored = $authored;
+
+        return $this;
+    }
+
+    /**
+     * Returns authors.
+     *
+     * @return int[]
+     */
+    public function getAuthors()
+    {
+        return $this->authors;
+    }
+
+    /**
+     * Set authors.
+     *
+     * @param int[] $authors
+     *
+     * @return $this
+     */
+    public function setAuthors($authors)
+    {
+        $this->authors = $authors;
+
+        return $this;
+    }
 }

Document/Index/ArticleIndexer.php

@@ -90,6 +90,7 @@ public function index(ArticleDocument $document)
         $article->setTitle($document->getTitle());
         $article->setChanged($document->getChanged());
         $article->setCreated($document->getCreated());
+        $article->setAuthored($document->getAuthored());
         $article->setChanger($this->userManager->getFullNameByUserId($document->getChanger()));
         $article->setCreator($this->userManager->getFullNameByUserId($document->getCreator()));
         $article->setType($this->getType($structure->getStructure()));

Document/Subscriber/ArticleSubscriber.php

@@ -207,5 +207,19 @@ public function handleMetadataLoad(MetadataLoadEvent $event)
                 'property' => 'routePath',
             ]
         );
+        $metadata->addFieldMapping(
+            'authored',
+            [
+                'encoding' => 'system_localized',
+                'property' => 'authored',
+            ]
+        );
+        $metadata->addFieldMapping(
+            'authors',
+            [
+                'encoding' => 'system_localized',
+                'property' => 'authors',
+            ]
+        );
     }
 }

Resources/config/serializer/Document.ArticleDocument.xml

@@ -26,6 +26,10 @@
         <property name="changed" type="DateTime" groups="defaultPage"/>
 
         <property name="published" type="DateTime" groups="defaultPage,smallPage"/>
+        <property name="authored" type="DateTime" groups="defaultPage,smallPage"/>
+        <property name="authors" groups="defaultPage,smallPage">
+            <type><![CDATA[array<integer>]]></type>
+        </property>
         <property name="extensions" type="Sulu\Component\Content\Document\Extension\ExtensionContainer" serialized-name="ext" groups="defaultPage,preview"/>
     </class>
 </serializer>

Resources/public/dist/components/articles/edit/settings/form.html

@@ -0,0 +1,56 @@
+<form id="settings-form" class="grid">
+    <div class="grid-row">
+        <div class="grid-col-6 form-group">
+            <label for="authored"><%= translations.authored %></label>
+
+            <div id="authored"
+                 data-mapper-property="authored"
+                 data-aura-component="input@husky"
+                 data-aura-skin="date"
+                 data-aura-instance-name="authored"
+                 data-aura-input-id="authored"
+                 data-type="husky-input"
+                 data-form="true"
+                 class="trigger-save-button"/>
+        </div>
+    </div>
+    <div class="grid-row">
+        <div class="grid-col-12 form-group">
+            <label for="authors"><%= translations.authors %></label>
+
+            <div id="authors"
+                 data-mapper-property="authors"
+                 data-form="true"
+                 data-type="contact-selection"
+                 data-type-instance-name="authors"
+                 data-aura-component="contact-selection@sulucontact"
+                 data-aura-instance-name="authors"
+                 data-aura-contact="true"
+                 data-aura-account="false"
+                 data-aura-url="/admin/api/customers"
+                 data-aura-contact-url="/admin/api/contacts?flat=true&sortBy=lastName"/>
+        </div>
+    </div>
+
+    <div class="grid-row section m-top-40" id="changelog-container" style="display: none;">
+        <h2 class="divider m-bottom-20" title="Shadow Section">
+            <%= translations.changelog %>
+        </h2>
+
+        <div class="grid">
+            <div class="grid-row">
+                <div class="grid-col-2"><%= translations.changed %></div>
+                <div class="grid-col-10" id="changed">
+                    <span class="name">...</span> (<span class="date">...</span>)
+                </div>
+            </div>
+
+            <div class="grid-row">
+                <div class="grid-col-2"><%= translations.created %></div>
+                <div class="grid-col-10" id="created">
+                    <span class="name">...</span> (<span class="date">...</span>)
+                </div>
+            </div>
+        </div>
+    </div>
+</form>

Resources/public/js/components/articles/edit/settings/form.html

@@ -0,0 +1,56 @@
+<form id="settings-form" class="grid">
+    <div class="grid-row">
+        <div class="grid-col-6 form-group">
+            <label for="authored"><%= translations.authored %></label>
+
+            <div id="authored"
+                 data-mapper-property="authored"
+                 data-aura-component="input@husky"
+                 data-aura-skin="date"
+                 data-aura-instance-name="authored"
+                 data-aura-input-id="authored"
+                 data-type="husky-input"
+                 data-form="true"
+                 class="trigger-save-button"/>
+        </div>
+    </div>
+    <div class="grid-row">
+        <div class="grid-col-12 form-group">
+            <label for="authors"><%= translations.authors %></label>
+
+            <div id="authors"
+                 data-mapper-property="authors"
+                 data-form="true"
+                 data-type="contact-selection"
+                 data-type-instance-name="authors"
+                 data-aura-component="contact-selection@sulucontact"
+                 data-aura-instance-name="authors"
+                 data-aura-contact="true"
+                 data-aura-account="false"
+                 data-aura-url="/admin/api/customers"
+                 data-aura-contact-url="/admin/api/contacts?flat=true&sortBy=lastName"/>
+        </div>
+    </div>
+
+    <div class="grid-row section m-top-40" id="changelog-container" style="display: none;">
+        <h2 class="divider m-bottom-20" title="Shadow Section">
+            <%= translations.changelog %>
+        </h2>
+
+        <div class="grid">
+            <div class="grid-row">
+                <div class="grid-col-2"><%= translations.changed %></div>
+                <div class="grid-col-10" id="changed">
+                    <span class="name">...</span> (<span class="date">...</span>)
+                </div>
+            </div>
+
+            <div class="grid-row">
+                <div class="grid-col-2"><%= translations.created %></div>
+                <div class="grid-col-10" id="created">
+                    <span class="name">...</span> (<span class="date">...</span>)
+                </div>
+            </div>
+        </div>
+    </div>
+</form>