Add comments sorting

2 files changed, 25 insertions, 2 deletions

diff --git a/app/Model/Comment.php b/app/Model/Comment.php
index e3ffc1be..c1c800c3 100644
--- a/app/Model/Comment.php
+++ b/app/Model/Comment.php
@@ -34,9 +34,10 @@ class Comment extends Base
      *
      * @access public
      * @param  integer  $task_id  Task id
+     * @param  string   $sorting  ASC/DESC
      * @return array
      */
-    public function getAll($task_id)
+    public function getAll($task_id, $sorting = 'ASC')
     {
         return $this->db
             ->table(self::TABLE)
@@ -51,7 +52,7 @@ class Comment extends Base
                 User::TABLE.'.email'
             )
             ->join(User::TABLE, 'id', 'user_id')
-            ->orderBy(self::TABLE.'.date_creation', 'ASC')
+            ->orderBy(self::TABLE.'.date_creation', $sorting)
             ->eq(self::TABLE.'.task_id', $task_id)
             ->findAll();
     }
diff --git a/app/Model/UserSession.php b/app/Model/UserSession.php
index 1ae3fdf4..4c0364ce 100644
--- a/app/Model/UserSession.php
+++ b/app/Model/UserSession.php
@@ -154,4 +154,26 @@ class UserSession extends Base
     {
         $_SESSION['board_collapsed'][$project_id] = $collapsed;
     }
+
+    /**
+     * Set comments sorting
+     *
+     * @access public
+     * @param  string $order
+     */
+    public function setCommentSorting($order)
+    {
+        $this->session['comment_sorting'] = $order;
+    }
+
+    /**
+     * Get comments sorting direction
+     *
+     * @access public
+     * @return string
+     */
+    public function getCommentSorting()
+    {
+        return $this->session['comment_sorting'] ?: 'ASC';
+    }
 }