diff options
Diffstat (limited to 'app/Controller')
| -rw-r--r-- | app/Controller/Comment.php | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/app/Controller/Comment.php b/app/Controller/Comment.php index 9796ea38..68dc44a7 100644 --- a/app/Controller/Comment.php +++ b/app/Controller/Comment.php @@ -41,6 +41,7 @@ class Comment extends Base public function create(array $values = array(), array $errors = array()) { $task = $this->getTask(); + $ajax = $this->request->isAjax() || $this->request->getIntegerParam('ajax'); if (empty($values)) { $values = array( @@ -49,14 +50,23 @@ class Comment extends Base ); } + if ($ajax) { + $this->response->html($this->template->render('comment/create', array( + 'values' => $values, + 'errors' => $errors, + 'task' => $task, + 'ajax' => $ajax + ))); + } else { $this->response->html($this->taskLayout('comment/create', array( 'values' => $values, 'errors' => $errors, 'task' => $task, 'title' => t('Add a comment') ))); + } } - + /** * Add a comment * @@ -66,7 +76,8 @@ class Comment extends Base { $task = $this->getTask(); $values = $this->request->getValues(); - + $ajax = $this->request->isAjax() || $this->request->getIntegerParam('ajax'); + list($valid, $errors) = $this->comment->validateCreation($values); if ($valid) { @@ -78,7 +89,12 @@ class Comment extends Base $this->session->flashError(t('Unable to create your comment.')); } - $this->response->redirect('?controller=task&action=show&task_id='.$task['id'].'&project_id='.$task['project_id'].'#comments'); + if ($ajax) { + $this->response->redirect('?controller=board&action=show&project_id='.$task['project_id']); + } + else { + $this->response->redirect('?controller=task&action=show&task_id='.$task['id'].'&project_id='.$task['project_id'].'#comments'); + } } $this->create($values, $errors); |