summaryrefslogtreecommitdiff
path: root/app/Controller/TaskAjaxController.php
diff options
context:
space:
mode:
authorphecho <phecho@163.com>2016-12-21 10:58:41 +0800
committerphecho <phecho@163.com>2016-12-21 10:58:41 +0800
commit4724367e3b9c10af23bb6596f8f678477927c8c3 (patch)
tree06ee4e860252222c1784e182d87e22b879451751 /app/Controller/TaskAjaxController.php
parent56d00ac1592ba5ab7006dfd161f1893e1fdc9bb0 (diff)
parent9d5d389de841705450190fb1ebbaa11393870dfe (diff)
Fix conflict
Diffstat (limited to 'app/Controller/TaskAjaxController.php')
-rw-r--r--app/Controller/TaskAjaxController.php6
1 files changed, 2 insertions, 4 deletions
diff --git a/app/Controller/TaskAjaxController.php b/app/Controller/TaskAjaxController.php
index 609dd23c..6d0b3fc2 100644
--- a/app/Controller/TaskAjaxController.php
+++ b/app/Controller/TaskAjaxController.php
@@ -8,8 +8,6 @@ use Kanboard\Filter\TaskProjectsFilter;
use Kanboard\Filter\TaskStartsWithIdFilter;
use Kanboard\Filter\TaskStatusFilter;
use Kanboard\Filter\TaskTitleFilter;
-use Kanboard\Formatter\TaskAutoCompleteFormatter;
-use Kanboard\Formatter\TaskSuggestMenuFormatter;
use Kanboard\Model\TaskModel;
/**
@@ -46,7 +44,7 @@ class TaskAjaxController extends BaseController
$filter->withFilter(new TaskTitleFilter($search));
}
- $this->response->json($filter->format(new TaskAutoCompleteFormatter($this->container)));
+ $this->response->json($filter->format($this->taskAutoCompleteFormatter));
}
}
@@ -66,7 +64,7 @@ class TaskAjaxController extends BaseController
->withFilter(new TaskStatusFilter(TaskModel::STATUS_OPEN))
->withFilter(new TaskStartsWithIdFilter($taskId));
- $this->response->json($filter->format(new TaskSuggestMenuFormatter($this->container)));
+ $this->response->json($filter->format($this->taskSuggestMenuFormatter));
}
}
}