1 files changed, 26 insertions, 8 deletions

diff --git a/app/Controller/CommentController.php b/app/Controller/CommentController.php
index 2a8c258a..526bd2bf 100644
--- a/app/Controller/CommentController.php
+++ b/app/Controller/CommentController.php
@@ -4,6 +4,7 @@ namespace Kanboard\Controller;
 
 use Kanboard\Core\Controller\AccessForbiddenException;
 use Kanboard\Core\Controller\PageNotFoundException;
+use Kanboard\Model\UserMetadataModel;
 
 /**
  * Comment Controller
@@ -47,6 +48,7 @@ class CommentController extends BaseController
      */
     public function create(array $values = array(), array $errors = array())
     {
+        $project = $this->getProject();
         $task = $this->getTask();
 
         if (empty($values)) {
@@ -56,10 +58,13 @@ class CommentController extends BaseController
             );
         }
 
-        $this->response->html($this->template->render('comment/create', array(
+        $values['project_id'] = $task['project_id'];
+
+        $this->response->html($this->helper->layout->task('comment/create', array(
             'values' => $values,
             'errors' => $errors,
             'task' => $task,
+            'project' => $project,
         )));
     }
 
@@ -82,10 +87,10 @@ class CommentController extends BaseController
                 $this->flash->failure(t('Unable to create your comment.'));
             }
 
-            return $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), 'comments'), true);
+            $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), 'comments'), true);
+        } else {
+            $this->create($values, $errors);
         }
-
-        return $this->create($values, $errors);
     }
 
     /**
@@ -102,8 +107,14 @@ class CommentController extends BaseController
         $task = $this->getTask();
         $comment = $this->getComment();
 
+        if (empty($values)) {
+            $values = $comment;
+        }
+
+        $values['project_id'] = $task['project_id'];
+
         $this->response->html($this->template->render('comment/edit', array(
-            'values' => empty($values) ? $comment : $values,
+            'values' => $values,
             'errors' => $errors,
             'comment' => $comment,
             'task' => $task,
@@ -183,9 +194,16 @@ class CommentController extends BaseController
     {
         $task = $this->getTask();
 
-        $order = $this->userSession->getCommentSorting() === 'ASC' ? 'DESC' : 'ASC';
-        $this->userSession->setCommentSorting($order);
+        $oldDirection = $this->userMetadataCacheDecorator->get(UserMetadataModel::KEY_COMMENT_SORTING_DIRECTION, 'ASC');
+        $newDirection = $oldDirection === 'ASC' ? 'DESC' : 'ASC';
 
-        $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), 'comments'));
+        $this->userMetadataCacheDecorator->set(UserMetadataModel::KEY_COMMENT_SORTING_DIRECTION, $newDirection);
+
+        $this->response->redirect($this->helper->url->to(
+            'TaskViewController',
+            'show',
+            array('task_id' => $task['id'], 'project_id' => $task['project_id']),
+            'comments'
+        ));
     }
 }