Add sorting for last modified or authored

sulu · Feb 9, 2024 · 1eaa2a5 · 1eaa2a5
1 parent 1338a09
commit 1eaa2a5
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 0 deletions.
diff --git a/Content/ArticleDataProvider.php b/Content/ArticleDataProvider.php
@@ -130,6 +130,7 @@ protected function getConfigurationBuilder(): BuilderInterface
                     ['column' => 'created', 'title' => 'sulu_admin.created'],
                     ['column' => 'title.raw', 'title' => 'sulu_admin.title'],
                     ['column' => 'author_full_name.raw', 'title' => 'sulu_admin.author'],
+                    ['column' => 'last_modified_or_authored', 'title' => 'sulu_article.last_modified_or_authored'],
                 ]
             );
 

diff --git a/Document/ArticleViewDocument.php b/Document/ArticleViewDocument.php
@@ -182,6 +182,13 @@ class ArticleViewDocument implements ArticleViewDocumentInterface
      */
     protected $authored;
 
+    /**
+     * @var \DateTime
+     *
+     * @Property(type="date")
+     */
+    protected $lastModifiedOrAuthored;
+
     /**
      * @var string
      *
@@ -511,6 +518,23 @@ public function setLastModified($lastModified)
         return $this;
     }
 
+    public function getLastModifiedOrAuthored(): \DateTime
+    {
+        return $this->lastModified ?? $this->authored;
+    }
+
+    /**
+     * @param \DateTime|null $lastModified
+     *
+     * @return $this|ArticleViewDocument
+     */
+    public function setLastModifiedOrAuthored()
+    {
+        $this->lastModifiedOrAuthored = $this->lastModified ?? $this->authored;
+
+        return $this;
+    }
+
     public function getAuthored()
     {
         return $this->authored;

diff --git a/Document/ArticleViewDocumentInterface.php b/Document/ArticleViewDocumentInterface.php
@@ -289,6 +289,15 @@ public function getAuthored();
      */
     public function setAuthored(\DateTime $authored = null);
 
+    /**
+     * Returns lastModified or authored date.
+     *
+     * @return \DateTime|null
+     */
+    public function getLastModifiedOrAuthored();
+
+    public function setLastModifiedOrAuthored();
+
     /**
      * Returns author full name.
      *

diff --git a/Resources/translations/admin.de.json b/Resources/translations/admin.de.json
@@ -14,6 +14,7 @@
     "sulu_article.published_state": "Status der Veröffentlichung",
     "sulu_article.published": "Veröffentlicht",
     "sulu_article.not_published": "Nicht Veröffentlicht",
+    "sulu_article.last_modified_or_authored": "Zuletzt geändert oder verfasst",
     "sulu_activity.resource.articles": "Artikel",
     "sulu_activity.resource.articles.translation": "Übersetzung",
     "sulu_activity.description.articles.created": "{userFullName} hat den Artikel \"{resourceTitle}\" erstellt",

diff --git a/Resources/translations/admin.en.json b/Resources/translations/admin.en.json
@@ -14,6 +14,7 @@
     "sulu_article.published_state": "Published State",
     "sulu_article.published": "Published",
     "sulu_article.not_published": "Not Published",
+    "sulu_article.last_modified_or_authored": "Last modified or authored",
     "sulu_activity.resource.articles": "Article",
     "sulu_activity.resource.articles.translation": "Translation",
     "sulu_activity.description.articles.created": "{userFullName} has created the article \"{resourceTitle}\"",