diff options
| -rw-r--r-- | app/Controller/Comment.php | 29 | ||||
| -rw-r--r-- | app/Template/comment/create.php | 6 |
2 files changed, 17 insertions, 18 deletions
diff --git a/app/Controller/Comment.php b/app/Controller/Comment.php index 68dc44a7..50032000 100644 --- a/app/Controller/Comment.php +++ b/app/Controller/Comment.php @@ -51,22 +51,22 @@ 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->template->render('comment/create', array( + 'values' => $values, + 'errors' => $errors, + 'task' => $task, + 'ajax' => $ajax, + ))); + } + $this->response->html($this->taskLayout('comment/create', array( 'values' => $values, 'errors' => $errors, 'task' => $task, - 'title' => t('Add a comment') + 'title' => t('Add a comment'), ))); - } } - + /** * Add a comment * @@ -77,7 +77,7 @@ 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) { @@ -90,11 +90,10 @@ class Comment extends Base } 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->response->redirect('?controller=board&action=show&project_id='.$task['project_id']); } + + $this->response->redirect('?controller=task&action=show&task_id='.$task['id'].'&project_id='.$task['project_id'].'#comments'); } $this->create($values, $errors); diff --git a/app/Template/comment/create.php b/app/Template/comment/create.php index 2ef3ee59..8d2b05dc 100644 --- a/app/Template/comment/create.php +++ b/app/Template/comment/create.php @@ -2,7 +2,7 @@ <h2><?= t('Add a comment') ?></h2> </div> -<form method="post" action="<?= $this->u('comment', 'save', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'ajax' => $ajax)) ?>" autocomplete="off"> +<form method="post" action="<?= $this->u('comment', 'save', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'ajax' => isset($ajax))) ?>" autocomplete="off"> <?= $this->formCsrf() ?> <?= $this->formHidden('task_id', $values) ?> <?= $this->formHidden('user_id', $values) ?> @@ -30,11 +30,11 @@ <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/> <?php if (! isset($skip_cancel)): ?> <?= t('or') ?> - <?php if ($ajax): ?> + <?php if (isset($ajax)): ?> <?= $this->a(t('cancel'), 'board', 'show', array('project_id' => $task['project_id'])) ?> <?php else: ?> <?= $this->a(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?> - <?php endif ?> + <?php endif ?> <?php endif ?> </div> </form> |