Display project name for task auto-complete fields

3 files changed, 42 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 3fcb6ed6..fc0cdac6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,7 @@ New features:
 
 Improvements:
 
+* Display project name for task auto-complete fields
 * Make search attributes not case sensitive
 * Display TOTP issuer for 2FA
 * Make sure that the table schema_version use InnoDB for Mysql
diff --git a/app/Formatter/TaskAutoCompleteFormatter.php b/app/Formatter/TaskAutoCompleteFormatter.php
index 4f1c4c69..2d9f7341 100644
--- a/app/Formatter/TaskAutoCompleteFormatter.php
+++ b/app/Formatter/TaskAutoCompleteFormatter.php
@@ -3,6 +3,7 @@
 namespace Kanboard\Formatter;
 
 use Kanboard\Core\Filter\FormatterInterface;
+use Kanboard\Model\ProjectModel;
 use Kanboard\Model\TaskModel;
 
 /**
@@ -21,11 +22,15 @@ class TaskAutoCompleteFormatter extends BaseFormatter implements FormatterInterf
      */
     public function format()
     {
-        $tasks = $this->query->columns(TaskModel::TABLE.'.id', TaskModel::TABLE.'.title')->findAll();
+        $tasks = $this->query->columns(
+            TaskModel::TABLE.'.id',
+            TaskModel::TABLE.'.title',
+            ProjectModel::TABLE.'.name AS project_name'
+        )->asc(TaskModel::TABLE.'.id')->findAll();
 
         foreach ($tasks as &$task) {
             $task['value'] = $task['title'];
-            $task['label'] = '#'.$task['id'].' - '.$task['title'];
+            $task['label'] = $task['project_name'].' > #'.$task['id'].' '.$task['title'];
         }
 
         return $tasks;
diff --git a/tests/units/Formatter/TaskAutoCompleteFormatterTest.php b/tests/units/Formatter/TaskAutoCompleteFormatterTest.php
new file mode 100644
index 00000000..20baf549
--- /dev/null
+++ b/tests/units/Formatter/TaskAutoCompleteFormatterTest.php
@@ -0,0 +1,34 @@
+<?php
+
+use Kanboard\Formatter\TaskAutoCompleteFormatter;
+use Kanboard\Model\ProjectModel;
+use Kanboard\Model\TaskCreationModel;
+use Kanboard\Model\TaskFinderModel;
+
+require_once __DIR__.'/../Base.php';
+
+class TaskAutoCompleteFormatterTest extends Base
+{
+    public function testFormat()
+    {
+        $projectModel = new ProjectModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $taskFinderModel = new TaskFinderModel($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'My Project')));
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'Task 1', 'project_id' => 1)));
+        $this->assertEquals(2, $taskCreationModel->create(array('title' => 'Task 2', 'project_id' => 1)));
+
+        $tasks = TaskAutoCompleteFormatter::getInstance($this->container)
+            ->withQuery($taskFinderModel->getExtendedQuery())
+            ->format();
+
+        $this->assertCount(2, $tasks);
+        $this->assertEquals('My Project > #1 Task 1', $tasks[0]['label']);
+        $this->assertEquals('Task 1', $tasks[0]['value']);
+        $this->assertEquals(1, $tasks[0]['id']);
+        $this->assertEquals('My Project > #2 Task 2', $tasks[1]['label']);
+        $this->assertEquals('Task 2', $tasks[1]['value']);
+        $this->assertEquals(2, $tasks[1]['id']);
+    }
+}