summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog1
-rw-r--r--app/Template/comment_list/create.php2
-rw-r--r--app/Template/task_comments/show.php6
3 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index f4fb94c4..7c0b9eb6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,7 @@ Improvements:
Bug fixes:
+* Fix broken user mentions in comment form at the bottom of the task view page
* Ensure project tags are removed when the project is removed
* Avoid PHP notice when regenerating API token for a user
* Fix wrong dropdown menu in group members list
diff --git a/app/Template/comment_list/create.php b/app/Template/comment_list/create.php
index a1bae5eb..4c86bc06 100644
--- a/app/Template/comment_list/create.php
+++ b/app/Template/comment_list/create.php
@@ -3,6 +3,6 @@
</div>
<form method="post" action="<?= $this->url->href('CommentListController', 'save', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" autocomplete="off">
<?= $this->form->csrf() ?>
- <?= $this->form->textEditor('comment', array(), array(), array('required' => true)) ?>
+ <?= $this->form->textEditor('comment', array('project_id' => $task['project_id']), array(), array('required' => true)) ?>
<?= $this->modal->submitButtons() ?>
</form>
diff --git a/app/Template/task_comments/show.php b/app/Template/task_comments/show.php
index d34e5e95..47bb5ff2 100644
--- a/app/Template/task_comments/show.php
+++ b/app/Template/task_comments/show.php
@@ -25,7 +25,11 @@
<?php if ($editable): ?>
<?= $this->render('task_comments/create', array(
- 'values' => array(),
+ 'values' => array(
+ 'user_id' => $this->user->getId(),
+ 'task_id' => $task['id'],
+ 'project_id' => $task['project_id'],
+ ),
'errors' => array(),
'task' => $task,
)) ?>