Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/Job/NotificationJob.php

1 files changed, 7 insertions, 2 deletions

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;